StateMc/BetterFoliage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'Snownee-1.12' into kotlin-1.12

Browse Source 
# Conflicts:
#	src/main/resources/assets/betterfoliage/crop_default.cfg
#	src/main/resources/assets/betterfoliage/leaves_blocks_default.cfg
This commit is contained in:
octarine-noise
2021-04-26 11:53:34 +02:00
parent b1ad58c089 369348f6aa
commit 47c134049c
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/assets/betterfoliage/crop_default.cfg
View File

@@ -37,3 +37,7 @@ com.pam.harvestcraft.BlockPamWaterGarden
// Plants // Plants
shadows.plants2.block.BlockEnumCrop shadows.plants2.block.BlockEnumCrop
// Cuisine
snownee.cuisine.blocks.BlockCuisineCrops
-snownee.cuisine.blocks.BlockDoubleCrops

4
src/main/resources/assets/betterfoliage/leaves_blocks_default.cfg
View File

@@ -10,3 +10,7 @@ com.gildedgames.aether.common.blocks.natural.BlockAetherLeaves
// Plants // Plants
shadows.plants2.block.BlockEnumLeaves shadows.plants2.block.BlockEnumLeaves
shadows.plants2.block.BlockEnumNetherLeaves shadows.plants2.block.BlockEnumNetherLeaves
// Cuisine
snownee.cuisine.blocks.BlockModLeaves
snownee.cuisine.blocks.BlockShearedLeaves