Create/src/main/java/com/simibubi/create
grimmauld d16f41ccfb Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
2020-11-17 14:37:47 +01:00
..
compat/jei merge recent progress to 1.16 2020-11-14 15:22:32 +01:00
content Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-17 14:37:47 +01:00
events merge recent progress to 1.16 2020-11-14 15:22:32 +01:00
foundation porty porty all the PRs 2020-11-15 10:41:05 +01:00
AllBlockPartials.java Resolved merge conflicts - Does not Build 2020-10-30 03:06:15 -04:00
AllBlocks.java Add copper zinc and brass as beacon base back in 2020-11-15 15:21:38 +01:00
AllColorHandlers.java Prospective 1.16 port start - only find/replace fixes so far 2020-07-22 22:16:11 -04:00
AllContainerTypes.java Re-organized packages and utilities 2020-05-23 14:02:38 +02:00
AllEntityTypes.java These are not the chunks you are looking for 2020-07-22 14:12:19 +02:00
AllFluids.java Basic Brewing 2020-10-19 22:07:05 +02:00
AllItems.java Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-17 14:37:47 +01:00
AllKeys.java ForgeCraft Playtesting, Part I 2020-10-13 19:56:12 +02:00
AllMovementBehaviours.java Add experimental dropper and dispenser movement behaviours. 2020-09-01 22:41:17 +02: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 The Funnel doesn't end here 2020-11-11 19:00:31 +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 Destroyer of Lakes 2020-10-30 02:16:08 +01:00
AllTags.java Add copper zinc and brass as beacon base back in 2020-11-15 15:21:38 +01:00
AllTileEntities.java Automatic Acrobatics 2020-10-30 19:28:33 +01:00
Create.java Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.16/dev 2020-10-19 23:22:24 -04:00
CreateClient.java refactor AllTileEntities to match Registrate workflow 2020-08-21 12:59:30 +02:00