Merge branch 'master' into composters

2022-02-19 17:18:33 +00:00 · 2022-02-19 17:18:33 +00:00 · 948d9ab71a
parent 0e48a29787 f36ea0849a
commit 948d9ab71a
8 changed files with 2 additions and 7 deletions
--- a/mods/CORE/mcl_bubble_column/mod.conf
+++ b/mods/CORE/mcl_bubble_column/mod.conf
@ -0,0 +1 @@
 name = mcl_bubble_column
--- a/mods/ITEMS/mcl_blackstone/depends.txt
+++ b/mods/ITEMS/mcl_blackstone/depends.txt
@ -1,7 +0,0 @@
 mcl_core
 screwdriver
 mcl_stairs
 mclx_stairs
 mcl_walls
 mclx_fences
 mcl_torches
--- a/mods/ITEMS/mcl_blackstone/mod.conf
+++ b/mods/ITEMS/mcl_blackstone/mod.conf
@ -1 +1,2 @@
 name = mcl_blackstone
 depends = mcl_core,screwdriver,mcl_stairs,mclx_stairs,mcl_walls,mclx_fences,mcl_torches
--- a/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry.png
+++ b/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry.png
--- a/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_0.png
+++ b/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_0.png
--- a/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_1.png
+++ b/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_1.png
--- a/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_2.png
+++ b/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_2.png
--- a/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_3.png
+++ b/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_3.png
`@ -1 +1,2 @@`
	`name = mcl_blackstone`	`name = mcl_blackstone`
		`depends = mcl_core,screwdriver,mcl_stairs,mclx_stairs,mcl_walls,mclx_fences,mcl_torches`