zelophed e05eb5c386 Merge branch 'mc1.15/dev' into mc1.16/dev ... # Conflicts: # src/main/java/com/simibubi/create/foundation/config/CClient.java # src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java		2021-04-03 01:00:57 +02:00
..
compat/jei	GuiGameReposition	2021-03-25 02:27:10 +01:00
content	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-04-02 22:27:37 +02:00
events	Fix Tooltips on 1.16	2021-03-30 16:32:19 +02:00
foundation	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-04-03 01:00:57 +02:00
AllBlockPartials.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-30 14:58:08 -07:00
AllBlocks.java	Merge & Port	2021-03-28 10:58:25 +02:00
AllColorHandlers.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-02-19 00:49:39 +01:00
AllContainerTypes.java	Re-organized packages and utilities	2020-05-23 14:02:38 +02:00
AllEntityTypes.java	Make contraptions not take that stupid amount of cpu time when in water	2021-03-01 10:37:49 +01:00
AllFluids.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-01-04 14:15:53 +01:00
AllItems.java	Merge & Port	2021-03-29 10:57:50 +02:00
AllKeys.java	ForgeCraft Playtesting, Part I	2020-10-13 19:56:12 +02:00
AllMovementBehaviours.java	Refactor Attractor	2020-11-19 21:07:32 +01:00
AllParticleTypes.java	Spinny vortex	2020-11-06 19:45:38 +01:00
AllRecipeTypes.java	More unfinished basin business	2020-10-06 20:43:13 +02:00
AllShapes.java	Thinking Arms	2021-03-22 02:05:47 +01:00
AllSoundEvents.java	Grunt work detected	2020-08-27 02:35:57 +02:00
AllSpecialTextures.java	Fundamentals of Fluid Transfer	2020-08-24 21:02:03 +02:00
AllSpriteShifts.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-20 12:58:02 +01:00
AllTags.java	Add Create stone to base_stone_overworld block tag (terraforged was complaining)	2021-03-26 23:21:44 +01:00
AllTileEntities.java	Instanced bearings	2021-03-31 16:19:58 -07:00
Create.java	Try to make terraforged less angry against Create world gen	2021-03-27 19:15:52 +01:00
CreateClient.java	GuiGameReposition	2021-03-25 02:27:10 +01:00