Dylan K. Taylor
2a9498a4f9
Merge commit 'a90132a30'
...
# Conflicts:
# resources/vanilla
2020-06-13 11:22:18 +01:00
Dylan K. Taylor
d82264fe60
Merge commit 'dfbd85777'
...
# Conflicts:
# resources/vanilla
# src/VersionInfo.php
2020-06-13 11:21:43 +01:00
Dylan K. Taylor
586f265033
update build/php submodule to pmmp/php-build-scripts@2f422db397
2020-06-13 11:17:58 +01:00
Dylan K. Taylor
a90132a30e
added missing 3.12.6 changelog
2020-06-04 20:38:06 +01:00
Dylan K. Taylor
dfbd857771
3.13.1 is next
2020-06-04 20:01:28 +01:00
Dylan K. Taylor
323d96d5c1
Release 3.13.0
2020-06-04 20:01:27 +01:00
Dylan K. Taylor
f495ba1d0b
Merge branch 'next-minor' into stable
2020-06-04 19:59:46 +01:00
Dylan K. Taylor
643cf0ebf8
3.12.7 is next
2020-06-04 19:55:09 +01:00
Dylan K. Taylor
1614206a6d
Release 3.12.6
2020-06-04 19:55:09 +01:00
Dylan K. Taylor
f3bcd04e87
update build/php submodule to pmmp/php-build-scripts@fd749b299a
2020-06-04 14:16:45 +01:00
Dylan K. Taylor
b8e57282e3
Merge branch 'next-minor'
...
# Conflicts:
# resources/vanilla
2020-06-04 14:14:09 +01:00
Dylan K. Taylor
2affdc1af2
Merge commit '00916ade0'
2020-06-04 14:13:52 +01:00
Dylan K. Taylor
c29ed34b54
Merge commit 'f4ee2912db89c6629d4fa191e993f0798035ef20'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Server.php
2020-06-04 14:13:23 +01:00
Dylan K. Taylor
0a3bd6fe78
Merge commit 'a0de9b0d4'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-04 14:11:00 +01:00
Dylan K. Taylor
fcc2352203
Merge commit '03e8cd3ed'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-04 14:07:55 +01:00
Dylan K. Taylor
3e9018a838
Merge commit '7af4e70f6'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/entity/Entity.php
2020-06-04 14:02:00 +01:00
Dylan K. Taylor
0ae2c6302a
Merge branch 'stable' into next-minor
2020-06-04 13:59:30 +01:00
Dylan K. Taylor
4f59c1b26c
.gitignore: ignore some extra crap
2020-06-04 13:58:46 +01:00
Dylan K. Taylor
00916ade0c
update build/php submodule to pmmp/php-build-scripts@0aa88d2765
2020-06-04 13:55:03 +01:00
Dylan K. Taylor
f4ee2912db
Server: tell me what is wrong when crash archive submission fails
2020-06-04 13:48:40 +01:00
Dylan K. Taylor
a0de9b0d46
Player: use real time to update rate limit, fixes #3554 (except in very extreme cases)
2020-06-04 13:39:26 +01:00
Dylan K. Taylor
03e8cd3ed4
Player: fixing ground state handling in spectator mode, closes #3552 , closes #3553
2020-06-04 11:10:21 +01:00
Dylan K. Taylor
7af4e70f64
Entity: fixed movement updates not firing after teleport
...
this became obvious by teleporting non-moving entities into the air and observing that they didn't fall.
2020-06-04 10:52:04 +01:00
Dylan K. Taylor
017afead3b
extract FurnaceRecipeManager unit from CraftingManager
...
I'd like to have this directly provided to Furnace, but I don't know how to short of making into a singleton. Since I want to have per-furnace recipe managers (e.g. for stuff like blast furnace vs regular furnace etc), a singleton isn't really an option.
2020-06-03 18:59:59 +01:00
Dylan K. Taylor
b58c425189
Merge branch 'next-minor'
...
# Conflicts:
# changelogs/3.12.md
# resources/vanilla
# src/VersionInfo.php
2020-06-03 13:11:30 +01:00
Dylan K. Taylor
0af5dbc89b
Merge commit '3be83e09f'
2020-06-03 13:09:04 +01:00
Dylan K. Taylor
bce7cdd461
Merge commit 'f24be2b05'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
# src/pocketmine/block/SnowLayer.php
2020-06-03 13:08:48 +01:00
Dylan K. Taylor
a5e08e9a71
Merge commit '92cffc00d'
2020-06-03 13:06:02 +01:00
Dylan K. Taylor
c864647cd1
Merge branch 'stable' into next-minor
2020-06-03 13:04:08 +01:00
Dylan K. Taylor
d2d4780653
Merge commit 'a3f633862'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-03 13:03:23 +01:00
Dylan K. Taylor
7d7c16b764
Merge commit '21aef97ba'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-03 13:00:31 +01:00
Dylan K. Taylor
892fa1598d
Merge commit 'ed0d1978a'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/item/WritableBook.php
2020-06-03 12:58:57 +01:00
Dylan K. Taylor
01cbd27485
Merge commit 'd64561b0b'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-03 12:57:20 +01:00
Dylan K. Taylor
b2f182b196
Merge commit 'd234d3e45'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/command/defaults/ParticleCommand.php
2020-06-03 12:55:46 +01:00
Dylan K. Taylor
90b53149d7
Merge commit '5056754ce'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-03 12:54:00 +01:00
Dylan K. Taylor
5b0964cec8
Merge commit '2dc3cf816'
...
# Conflicts:
# resources/vanilla
2020-06-03 12:52:42 +01:00
Dylan K. Taylor
2bf73c7a4a
Merge commit '8c5a81cf5'
...
# Conflicts:
# resources/vanilla
2020-06-03 12:50:09 +01:00
Dylan K. Taylor
e7d712aeb6
Merge commit '2b58f2baf'
...
# Conflicts:
# resources/vanilla
# src/entity/object/FallingBlock.php
2020-06-03 12:47:44 +01:00
Dylan K. Taylor
c72937a4af
Merge commit '5dadf1237'
...
# Conflicts:
# resources/vanilla
2020-06-03 12:46:06 +01:00
Dylan K. Taylor
544bcb8f12
Merge commit '0d4e473bd'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-03 12:45:28 +01:00
Dylan K. Taylor
087b31e7f0
Merge commit '11cedc401'
2020-06-03 12:44:05 +01:00
Dylan K. Taylor
e250553670
Merge commit '3f2455f09'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/block/SnowLayer.php
2020-06-03 12:43:36 +01:00
Dylan K. Taylor
d7ae86b30c
Merge commit '9d26a224a'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/block/DoublePlant.php
2020-06-03 12:35:59 +01:00
Dylan K. Taylor
9e98666f57
Merge commit 'c4ad39046'
...
# Conflicts:
# resources/vanilla
2020-06-03 12:31:42 +01:00
Dylan K. Taylor
899da1b7f7
Merge commit '42e14f749'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
# src/pocketmine/item/Bow.php
# src/world/World.php
2020-06-03 12:31:17 +01:00
Dylan K. Taylor
92ed9e6125
3.12.6 is next
2020-06-03 10:59:33 +01:00
Dylan K. Taylor
c32026333f
Release 3.12.5
2020-06-03 10:59:33 +01:00
Dylan K. Taylor
915224c8e5
Living: fix being unable to die in the void
2020-06-02 23:18:40 +01:00
Dylan K. Taylor
734bc6c4a7
3.12.5 is next
2020-06-02 18:40:33 +01:00
Dylan K. Taylor
d36b24c518
Release 3.12.4
2020-06-02 18:40:33 +01:00
