tterrag a1605af46a Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15-v0.2.2 ... # Conflicts: # build.gradle # src/main/java/com/simibubi/create/foundation/utility/SuperByteBuffer.java # src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java # src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java # src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java # src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillstoneBlock.java # src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java # src/main/java/com/simibubi/create/modules/contraptions/processing/BasinBlock.java # src/main/java/com/simibubi/create/modules/contraptions/redstone/AnalogLeverBlock.java # src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java # src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java # src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntityRenderer.java # src/main/java/com/simibubi/create/modules/curiosities/partialWindows/WindowInABlockModel.java # src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkBlock.java # src/main/java/com/simibubi/create/modules/logistics/block/StockswitchBlock.java # src/main/java/com/simibubi/create/modules/palettes/CTGlassPaneBlock.java # src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableBlock.java # src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonBlock.java # src/main/resources/META-INF/mods.toml		2020-04-12 15:25:52 -04:00
..
compat/jei	Yet more porting work	2020-03-29 00:07:49 -04:00
config	Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15-v0.2.2	2020-04-12 15:25:52 -04:00
foundation	Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15-v0.2.2	2020-04-12 15:25:52 -04:00
modules	Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15-v0.2.2	2020-04-12 15:25:52 -04:00
AllBlockPartials.java	1.15 port checkpoint: kinetic rendering mostly complete	2020-04-04 21:54:24 -04:00
AllBlocks.java	Cast with Caution	2020-04-05 18:02:46 +02:00
AllBlockTags.java	Bug Fixes in 0.1.1a	2019-10-15 22:22:19 +02:00
AllContainers.java	Cast with Caution	2020-04-05 18:02:46 +02:00
AllCTs.java	Final Palettes Push	2020-02-08 03:47:27 +01:00
AllEntities.java	More porting work	2020-03-28 22:10:23 -04:00
AllItems.java	Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15-v0.2.2	2020-04-12 15:25:52 -04:00
AllItemTags.java	Bug Fixes in 0.1.1a	2019-10-15 22:22:19 +02:00
AllKeys.java	More porting work	2020-03-28 22:10:23 -04:00
AllPackets.java	Compare, but do not fall	2020-03-15 12:42:36 +01:00
AllParticles.java	Clockwork Bearing and Rope Pulley	2020-02-15 18:54:23 +01:00
AllRecipes.java	The Millstone	2020-03-26 23:03:56 +01:00
AllSoundEvents.java	added datagen for BlockTags to AllBlocks	2020-03-28 02:27:43 +01:00
AllSpecialTextures.java	Alt-Shift-R	2019-08-29 01:51:28 +02:00
AllTileEntities.java	Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15-v0.2.2	2020-04-12 15:25:52 -04:00
ClientEvents.java	Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15-v0.2.2	2020-04-12 15:25:52 -04:00
Create.java	Bugs, Recipes and Storage Blocks	2020-03-23 17:04:09 +01:00
CreateClient.java	Merge remote-tracking branch 'origin/mc1.14-v0.2.2' into mc1.15-v0.2.2	2020-03-28 22:28:49 -04:00
CreateItemGroup.java	Yet more porting work	2020-03-29 00:07:49 -04:00
Events.java	Cast with Caution	2020-04-05 18:02:46 +02:00
ResourceReloadHandler.java	Sprites and CT	2020-01-13 20:23:44 +01:00
ScreenResources.java	Sequenced Gearshift	2020-03-11 21:40:55 +01:00