Create/src/main/java/com/simibubi/create
PepperCode1 252aecabd5 Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev
Conflicts:
	src/main/java/com/simibubi/create/AllEntityDataSerializers.java
	src/main/java/com/simibubi/create/AllParticleTypes.java
	src/main/java/com/simibubi/create/AllRecipeTypes.java
	src/main/java/com/simibubi/create/AllSoundEvents.java
	src/main/java/com/simibubi/create/Create.java
	src/main/java/com/simibubi/create/events/CommonEvents.java
	src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java
	src/main/java/com/simibubi/create/foundation/worldgen/BiomeFilter.java
	src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenDecorator.java
	src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenFeatureEntry.java
	src/main/java/com/simibubi/create/foundation/worldgen/LayeredOreFeature.java
	src/main/java/com/simibubi/create/foundation/worldgen/OreFeatureBase.java
	src/main/java/com/simibubi/create/foundation/worldgen/VanillaStyleOreFeature.java
2022-08-05 13:56:19 -07:00
..
api Defer registration, datagen worldgen 2022-08-05 11:39:34 -07:00
compat Merge branch 'mc1.18/dev' into mc1.19/dev 2022-08-03 12:40:21 -07:00
content Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev 2022-08-05 13:56:19 -07:00
events Defer registration, datagen worldgen 2022-08-05 11:39:34 -07:00
foundation Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev 2022-08-05 13:56:19 -07:00
AllBlockPartials.java Tiny goggles 2022-07-08 18:34:27 -07:00
AllBlocks.java Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev 2022-08-05 13:56:19 -07:00
AllContainerTypes.java Look ma, both threads! 2022-03-08 03:51:03 +01:00
AllEnchantments.java
AllEntityDataSerializers.java Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev 2022-08-05 13:56:19 -07:00
AllEntityTypes.java Entering glue zone 2022-05-05 01:35:08 +02:00
AllFluids.java Fluids & Biome Modifiers 2022-08-01 22:37:39 +02:00
AllInteractionBehaviours.java Sequenced Porting 2022-08-03 14:52:44 -07:00
AllItems.java move from item-based air source detection to tag-based 2022-07-13 20:11:12 +02:00
AllKeys.java Version Conversion: 1.19 edition 2022-07-25 23:33:10 -07:00
AllMovementBehaviours.java Sequenced Porting 2022-08-03 14:52:44 -07:00
AllParticleTypes.java Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev 2022-08-05 13:56:19 -07:00
AllRecipeTypes.java Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev 2022-08-05 13:56:19 -07:00
AllShapes.java Sign me up 2022-05-31 21:51:38 +02:00
AllSoundEvents.java Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev 2022-08-05 13:56:19 -07:00
AllSpecialTextures.java Entering glue zone 2022-05-05 01:35:08 +02:00
AllSpriteShifts.java Clean CT 2022-07-06 12:06:27 -07:00
AllStitchedTextures.java
AllStructureProcessorTypes.java Defer registration, datagen worldgen 2022-08-05 11:39:34 -07:00
AllTags.java Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev 2022-08-05 13:56:19 -07:00
AllTileEntities.java Ponder Ponder Ponder 2022-06-28 00:07:10 +02:00
Create.java Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev 2022-08-05 13:56:19 -07:00
CreateClient.java Merge branch 'mc1.18/dev' into mc1.19/dev 2022-08-03 12:40:21 -07:00