Commit Graph

5804 Commits

Author SHA1 Message Date
850a1e1949 Updated Upstream (CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
f992ce60 Fix duplicate datapack reload on /reload
2021-06-14 23:51:30 -07:00
3516fa0093 Remove Paperclip submodule 2021-06-15 01:44:13 -05:00
3d3a28ba57 Remove now unnecessary scripts and update upstreamMerge.sh 2021-06-15 01:42:57 -05:00
825384c4a5 Run Gradle tasks in parallel by default 2021-06-15 01:29:55 -05:00
69ae01570d Update paperweight to 1.0.1 2021-06-15 01:19:26 -05:00
0f1177ece6 Update to paperweight 1.0.0, with automatic library imports 2021-06-15 00:56:07 -05:00
651ec26387 reorder patches after merge 2021-06-14 22:49:09 -07:00
b5d3f80d85 port some patches (#5837) 2021-06-15 01:44:37 -04:00
c9c3e59bbe Add back stream patch (#5838) 2021-06-14 22:38:36 -07:00
e2c2547bec update Fix incorrect status dataconverter for pre 1.13 chunks 2021-06-14 22:12:50 -07:00
995348f469 final patches from remapped and unmapped
keep in mind many patches in the removed folder still need to be updated
2021-06-14 21:55:46 -07:00
654d29f3a9 Fix mappings patches for Hopper getLevel issue 2021-06-14 23:39:41 -05:00
847628bbea Gradle & Paperclip updates 2021-06-14 23:17:16 -05:00
6b738c8252 fixes 2021-06-14 21:16:18 -07:00
67663024a2 Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
ebb0e28d #631: Add Villager#shakeHead
751469c6 #629: Add LivingEntity#isClimbing

CraftBukkit Changes:
622cf611 SPIGOT-6555: Cannot access shield BlockStateMeta
8b2e78ec SPIGOT-6542: Fix counting players with fauxSleeping = true
f66c437a SPIGOT-6561: Add events for dripleaf tilting
6ed40004 SPIGOT-6560: Crash when falling stalactite hits player
72a2901b SPIGOT-6557: PlayerEditBookEvent#setNewBookMeta does not update meta
a07e783a #865: Implement Villager#shakeHead
3252ff18 #863: Add LivingEntity#isClimbing
77058c79 SPIGOT-6554: Worlds created with the bukkit ChunkGenerator cannot save
2021-06-14 21:01:27 -07:00
d96afc738c update mappings files 2021-06-14 20:50:34 -07:00
d15e006a8c patches 2021-06-14 20:50:26 -07:00
b23eec8be4 Update editorconfig 2021-06-14 20:50:12 -07:00
5251afda5b Fix AT format issue 2021-06-14 22:58:14 -05:00
b8cf7d380e tons of patches (#5835) 2021-06-14 19:59:31 -07:00
2119f06b5a Re-add Chunk Priority/Urgency System (#5829) 2021-06-15 04:41:12 +02:00
fdd125c43e Put pom in correct location for Paperclip install to maven local feature 2021-06-14 18:50:13 -07:00
efc6fa6a04 more patches 2021-06-14 12:58:32 -07:00
26e04471c9 continue to load paperclip from jfrog for now 2021-06-14 22:29:55 +02:00
06259effd0 add access transforming capabilities 2021-06-14 22:15:09 +02:00
1c8b088450 more patches & fixes to existing patches 2021-06-14 12:17:47 -07:00
38bf247e27 more patches 2021-06-14 11:50:22 -07:00
0c4da04848 run CI with --stacktrace 2021-06-14 21:12:21 +02:00
07d4b300d6 resolve paperweight from paper repo 2021-06-14 21:02:30 +02:00
b398125ead more patches 2021-06-14 09:58:00 -07:00
1314845ad3 fix no grav bee patch for world height changes 2021-06-14 08:19:29 -07:00
31c62f47a5 even more compile fixes 2021-06-14 17:17:08 +02:00
7e83323ab7 fix compile issues 2021-06-14 17:10:25 +02:00
a84faa9d7d even moar workkkkk 2021-06-14 16:41:34 +02:00
983b5e1680 need to look at this later, fails rn 2021-06-14 06:47:04 -07:00
c5794c5351 even MOAR progress 2021-06-14 06:45:16 -07:00
c5210433c1 Merge branch 'dev/1.17' of github.com:PaperMC/Paper into dev/1.17 2021-06-14 14:04:57 +02:00
578ec8c6fe more work work work 2021-06-14 12:42:08 +02:00
8865f5811d fix issue in hopper patch 2021-06-14 03:18:42 -07:00
b018b48e2c Merge branch 'dev/1.17' of github.com:PaperMC/Paper into dev/1.17 2021-06-14 12:13:18 +02:00
52bc694983 more work uwu 2021-06-14 11:46:59 +02:00
eb75bb7c8d decomp fixes 2021-06-14 02:15:37 -07:00
d38930d51e Add missing getLevel implementation to Hopper Minecart, add mapping to fix reobf 2021-06-14 02:06:46 -07:00
97f581f459 more patches (#5827)
* more patches

* even moar patches
2021-06-14 01:37:14 -07:00
111c52e314 add entity debug info patch back 2021-06-13 23:41:01 -07:00
6cb2a55e24 Add back incremental chunk saving patch 2021-06-13 22:34:40 -07:00
97607aab4e Fix mojangapi build 2021-06-13 23:56:15 -07:00
7007f67ebb patches 2021-06-13 23:45:29 -07:00
a61429bdcf ReAdded PreCreatureSpawnEvent from removed (#5814) 2021-06-14 07:40:21 +02:00
238b049489 Re-add xp orb merging patches (#5823) 2021-06-13 22:37:57 -07:00