mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-14 06:24:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
d09ccf24d2
Create/src
History
PepperCode1 d09ccf24d2 Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev 
Conflicts:
	src/main/java/com/simibubi/create/AllFluids.java
	src/main/java/com/simibubi/create/CreateClient.java
	src/main/java/com/simibubi/create/foundation/worldgen/BuiltinRegistration.java
	src/main/java/com/simibubi/create/foundation/worldgen/OreFeatureConfigEntry.java
2022-08-05 17:45:46 -07:00
..
generated/resources Defer registration, datagen worldgen 2022-08-05 11:39:34 -07:00
main Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev 2022-08-05 17:45:46 -07:00