PepperBell 01366e30bb Merge remote-tracking branch 'upstream/mc1.16/dev' into ... mc1.16/creative-cake Conflicts: src/generated/resources/.cache/cache src/generated/resources/assets/create/lang/unfinished/zh_tw.json		2021-07-17 17:52:39 -07:00
..
compat	Organize imports	2021-07-17 00:46:35 -07:00
content	Merge remote-tracking branch 'upstream/mc1.16/dev' into	2021-07-17 17:52:39 -07:00
events	Bulk remap, compiles	2021-07-15 11:32:03 +02:00
foundation	Merge remote-tracking branch 'upstream/mc1.16/dev' into	2021-07-17 17:52:39 -07:00
AllBlockPartials.java	Bulk remap, compiles	2021-07-15 11:32:03 +02:00
AllBlocks.java	Merge remote-tracking branch 'upstream/mc1.16/dev' into	2021-07-15 13:21:47 -07:00
AllContainerTypes.java	GUI cleanup and fixes	2021-06-12 21:16:16 -07:00
AllEnchantments.java	Magitank	2021-07-08 00:03:58 +02:00
AllEntityTypes.java	Bulk remap, compiles	2021-07-15 11:32:03 +02:00
AllFluids.java	Organize imports	2021-07-17 00:46:35 -07:00
AllItems.java	Merge remote-tracking branch 'upstream/mc1.16/dev' into	2021-07-15 13:21:47 -07:00
AllKeys.java	Bulk remap, compiles	2021-07-15 11:32:03 +02:00
AllMovementBehaviours.java	Init Cleanup	2021-05-22 18:00:10 -07:00
AllParticleTypes.java	Bulk remap, compiles	2021-07-15 11:32:03 +02:00
AllRecipeTypes.java	Minor cleanup changes	2021-07-16 15:11:28 -07:00
AllShapes.java	Minor cleanup changes	2021-07-16 15:11:28 -07:00
AllSoundEvents.java	Ponder namespace refactor	2021-07-17 00:39:05 -07:00
AllSpecialTextures.java	Bulk remap, compiles	2021-07-15 11:32:03 +02:00
AllSpriteShifts.java	Bulk remap, compiles	2021-07-15 11:32:03 +02:00
AllStitchedTextures.java	Instanced entities are lit	2021-06-09 00:26:54 -07:00
AllTags.java	Bulk remap, compiles	2021-07-15 11:32:03 +02:00
AllTileEntities.java	Dyeable Nixies, Part I	2021-07-06 15:04:22 +02:00
Create.java	Bug Fixes	2021-07-12 20:02:47 +02:00
CreateClient.java	Organize imports	2021-07-17 00:46:35 -07:00