Merge pull request #452 from cssmc/master

#1 [09.01.2022]

config/conjuring.json5

@@ -10,6 +10,62 @@
 		"ignorance_multiplier": 2,
 		// Which mob types you shouldn't be able to create a conjuring focus for
 		"conjurer_blacklist": [
+			"alaskanativecraft:moose",
+			"alaskanativecraft:ptarmigan",
+			"alaskanativecraft:seal",
+			"aqupd:caracal",
+			"artifacts:mimic",
+			"battletowers:tower_guardian",
+			"betterend:spawn_egg_cubozoa",
+			"betterend:spawn_egg_dragonfly",
+			"betterend:spawn_egg_end_fish",
+			"betterend:spawn_egg_end_slime",
+			"betterend:spawn_egg_shadow_walker",
+			"betterend:spawn_egg_silk_moth",
+			"biomemakeover:blightbat",
+			"biomemakeover:cowboy",
+			"biomemakeover:decayed",
+			"biomemakeover:dragonfly",
+			"biomemakeover:ghost",
+			"biomemakeover:giant_slime",
+			"biomemakeover:glowfish",
+			"biomemakeover:lightning_bug",
+			"biomemakeover:moth",
+			"biomemakeover:mushroom_trader",
+			"biomemakeover:owl",
+			"biomemakeover:rootling",
+			"biomemakeover:scuttler",
+			"biomemakeover:tadpole",
+			"biomemakeover:toad",
+			"dungeonsmod:deserted",
+			"dungeonsmod:ironslime",
+			"dungeonsmod:king",
+			"dungeonsmod:kraken",
+			"ratsmischief:rat",
+			"terrarianslimes:baby_slime",
+			"terrarianslimes:black_slime",
+			"terrarianslimes:blue_slime",
+			"terrarianslimes:corrupt_slime",
+			"terrarianslimes:crimslime",
+			"terrarianslimes:green_slime",
+			"terrarianslimes:ice_slime",
+			"terrarianslimes:illuminant_slime",
+			"terrarianslimes:jungle_slime",
+			"terrarianslimes:king_slime",
+			"terrarianslimes:lava_slime",
+			"terrarianslimes:mother_slime",
+			"terrarianslimes:pinky",
+			"terrarianslimes:purple_slime",
+			"terrarianslimes:rainbow_slime",
+			"terrarianslimes:red_slime",
+			"terrarianslimes:sand_slime",
+			"terrarianslimes:spiked_ice_slime",
+			"terrarianslimes:spiked_jungle_slime",
+			"terrarianslimes:spiked_slime",
+			"terrarianslimes:umbrella_slime",
+			"terrarianslimes:yellow_slime",
+			"untitledduckmod:duck",
+			"untitledduckmod:goose",
 			"minecraft:wither",
 			"minecraft:ender_dragon"
 		]

config/entitybanners.json

@@ -5,5 +5,5 @@
   "defenseMultiplier": 0.75,
   "shouldBroadcastWhenGivenBanner": true,
   "shouldBroadcastToEveryone": true,
-  "blacklistedEntities": []
-}
+  "blacklistedEntities": ["biomemakeover:adjudicator_mimic", "crusade:trebuchet_projectile"]
+}

config/roughlyenoughitems/config.json5

@@ -937,6 +937,11 @@
 					"id": "betterend:jellyshroom_crafting_table",
 					"Count": 1,
 					"type": "item"
+				},
+								{
+					"id": "betterend:lucernia_crafting_table",
+					"Count": 1,
+					"type": "item"
 				}
 			]
 		},

kubejs/assets/ecotones/lang/en_us.json

@@ -0,0 +1,3 @@
+{
+"item.ecotones.hazelnut":"Hazelnut"
+}

kubejs/assets/ecotones/lang/pl_pl.json

@@ -0,0 +1,3 @@
+{
+"item.ecotones.hazelnut":"Orzech Laskowy"
+}

kubejs/assets/golemsgalore/lang/en_us.json

@@ -0,0 +1,8 @@
+{
+ "entity.golemsgalore.obsdian_golem":"Obsidian Golem",
+ "entity.golemsgalore.hay_golem":"Hay Golem",
+ "entity.golemsgalore.diamond_laser_golem":"Diamond Laser Golem",
+ "golemsgalore.diamond_laser_golem_banner":"Diamond Laser Golem",
+ "golemsgalore.hay_golem_banner":"Hay Golem",
+ "golemsgalore.obsdian_golem":"Obsidian Golem"
+}

kubejs/assets/iron-jetpacks/lang/en_us.json

@@ -0,0 +1,4 @@
+{
+ "keybind.iron-jetpacks.engine":"Toggle Engine",
+ "keybind.iron-jetpacks.hover":"Toggle Hover Mode"
+}

kubejs/assets/iron-jetpacks/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+	"pack": {
+		"pack_format": 6,
+		"description": "Language"
+	}
+}

kubejs/assets/mocolors/lang/en_us.json

@@ -0,0 +1,6 @@
+{
+	"block.mocolors.colored_bricks_stairs":"Colored Bricks Stairs",
+	"block.mocolors.colored_bricks_slab":"Colored Bricks Slab",
+	"block.mocolors.colored_bricks":"Colored Bricks",
+	"block.mocolors.colored_glass":"Colored Glass"
+}

kubejs/assets/mocolors/lang/pl_pl.json

@@ -0,0 +1,6 @@
+{
+	"block.mocolors.colored_bricks_stairs":"Kolorowe Schody",
+	"block.mocolors.colored_bricks_slab":"Kolorowe Półpłytki",
+	"block.mocolors.colored_bricks":"Kolorowe Cegły",
+	"block.mocolors.colored_glass":"Kolorowe Szkło"
+}

kubejs/assets/mocolors/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+	"pack": {
+		"pack_format": 6,
+		"description": "Language"
+	}
+}

kubejs/assets/mtmechs/lang/en_us.json

@@ -0,0 +1,3 @@
+{
+"gamerule.mechOwnership":"Mech Ownership"	
+}

kubejs/assets/sandwichable/lang/en_us.json

@@ -0,0 +1,3 @@
+{
+"gamerule.maxSandwichSize":"Max Sandwich Size"	
+}

kubejs/assets/winged/lang/en_us.json

@@ -0,0 +1,3 @@
+{
+  "tooltip.winged.heart_of_the_sky":"§fWings ingredient"
+}

kubejs/assets/winged/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+	"pack": {
+		"pack_format": 6,
+		"description": "Language"
+	}
+}

kubejs/config/client.properties

@@ -5,11 +5,11 @@ barBorderColor=ECEFF4
 overrideColors=true
 menuBackgroundScale=32.0
 fmlMemoryColor=ECEFF4
-barColor=ECEFF4
+barColor=F06973
 showTagNames=true
 menuBackgroundBrightness=64
 disableRecipeBook=false
 menuInnerBackgroundBrightness=32
-title=
+title=All of Fabric 3
 backgroundColor=2E3440
 exportAtlases=false

kubejs/server_scripts/appliedenergistic2/missings.js

@@ -0,0 +1,126 @@
+//╔════════════════════════════════════════╗
+//║     GNU Free Documentation License     ║
+//╚════════════════════════════════════════╝
+
+events.listen("recipes", function (event) {
+
+//╔════════════════════════════════════════╗
+//║           AE2 MISSING SLABS            ║
+//╚════════════════════════════════════════╝
+
+	// Smooth slab
+	event.remove({ output: "appliedenergistics2:smooth_sky_stone_slab" });	
+    event.shaped(item.of("appliedenergistics2:smooth_sky_stone_slab", 6), [
+    ["appliedenergistics2:smooth_sky_stone_block", "appliedenergistics2:smooth_sky_stone_block", "appliedenergistics2:smooth_sky_stone_block"],
+   ]);
+
+   	// Small Brick Slab
+	event.remove({ output: "appliedenergistics2:sky_stone_small_brick_slab" });	
+    event.shaped(item.of("appliedenergistics2:sky_stone_small_brick_slab", 6), [
+    ["appliedenergistics2:sky_stone_small_brick", "appliedenergistics2:sky_stone_small_brick", "appliedenergistics2:sky_stone_small_brick"],
+   ]);
+
+	// Brick slab
+	event.remove({ output: "appliedenergistics2:sky_stone_brick_slab" });	
+    event.shaped(item.of("appliedenergistics2:sky_stone_brick_slab", 6), [
+    ["appliedenergistics2:sky_stone_brick", "appliedenergistics2:sky_stone_brick", "appliedenergistics2:sky_stone_brick"],
+   ]);
+
+	// Fluix Slab
+	event.remove({ output: "appliedenergistics2:fluix_slab" });	
+    event.shaped(item.of("appliedenergistics2:fluix_slab", 6), [
+    ["appliedenergistics2:fluix_block", "appliedenergistics2:fluix_block", "appliedenergistics2:fluix_block"],
+   ]);
+
+	// Stone Slab
+	event.remove({ output: "appliedenergistics2:sky_stone_slab" });	
+    event.shaped(item.of("appliedenergistics2:sky_stone_slab", 6), [
+    ["appliedenergistics2:sky_stone_block", "appliedenergistics2:sky_stone_block", "appliedenergistics2:sky_stone_block"],
+   ]);
+
+	// Quartz Slab
+	event.remove({ output: "appliedenergistics2:quartz_slab" });	
+    event.shaped(item.of("appliedenergistics2:quartz_slab", 6), [
+    ["appliedenergistics2:quartz_block", "appliedenergistics2:quartz_block", "appliedenergistics2:quartz_block"],
+   ]);
+
+	// Quartz Pillar Slab
+	event.remove({ output: "appliedenergistics2:quartz_pillar_slab" });	
+    event.shaped(item.of("appliedenergistics2:quartz_pillar_slab", 6), [
+   ["appliedenergistics2:quartz_pillar", "appliedenergistics2:quartz_pillar", "appliedenergistics2:quartz_pillar"],
+   ]);
+
+	// Chiseled Quartz Slab
+	event.remove({ output: "appliedenergistics2:chiseled_quartz_slab" });	
+    event.shaped(item.of("appliedenergistics2:chiseled_quartz_slab", 6), [
+    ["appliedenergistics2:chiseled_quartz_block", "appliedenergistics2:chiseled_quartz_block", "appliedenergistics2:chiseled_quartz_block"],
+   ]);
+
+//╔════════════════════════════════════════╗
+//║          AE2 MISSING STAIRS            ║
+//╚════════════════════════════════════════╝
+
+	// Smooth Stairs
+	event.remove({ output: "appliedenergistics2:smooth_sky_stone_stairs" });	
+    event.shaped(item.of("appliedenergistics2:smooth_sky_stone_stairs", 6), [
+	["appliedenergistics2:smooth_sky_stone_block", null, null],
+    ["appliedenergistics2:smooth_sky_stone_block", "appliedenergistics2:smooth_sky_stone_block", "mull"],
+	["appliedenergistics2:smooth_sky_stone_block", "appliedenergistics2:smooth_sky_stone_block", "appliedenergistics2:smooth_sky_stone_block"],
+   ]);
+
+   	// Small Brick Stairs
+	event.remove({ output: "appliedenergistics2:sky_stone_small_brick_stairs" });	
+    event.shaped(item.of("appliedenergistics2:sky_stone_small_brick_stairs", 6), [
+    ["appliedenergistics2:sky_stone_small_brick", null, null],
+    ["appliedenergistics2:sky_stone_small_brick", "appliedenergistics2:sky_stone_small_brick", null],
+    ["appliedenergistics2:sky_stone_small_brick", "appliedenergistics2:sky_stone_small_brick", "appliedenergistics2:sky_stone_small_brick"],
+   ]);
+
+	// Brick Stairs
+	event.remove({ output: "appliedenergistics2:sky_stone_brick_stairs" });	
+    event.shaped(item.of("appliedenergistics2:sky_stone_brick_stairs", 6), [
+    ["appliedenergistics2:sky_stone_brick", null, null],
+	["appliedenergistics2:sky_stone_brick", "appliedenergistics2:sky_stone_brick", null],
+	["appliedenergistics2:sky_stone_brick", "appliedenergistics2:sky_stone_brick", "appliedenergistics2:sky_stone_brick"],
+   ]);
+
+	// Fluix Stairs
+	event.remove({ output: "appliedenergistics2:fluix_stairs" });
+    event.shaped(item.of("appliedenergistics2:fluix_stairs", 6), [
+    ["appliedenergistics2:fluix_block", "null", "null"],
+    ["appliedenergistics2:fluix_block", "appliedenergistics2:fluix_block", "null"],
+    ["appliedenergistics2:fluix_block", "appliedenergistics2:fluix_block", "appliedenergistics2:fluix_block"],
+   ]);
+
+	// Stone Stairs
+	event.remove({ output: "appliedenergistics2:sky_stone_stairs" });	
+    event.shaped(item.of("appliedenergistics2:sky_stone_stairs", 6), [
+    ["appliedenergistics2:sky_stone_block", "null", "null"],
+    ["appliedenergistics2:sky_stone_block", "appliedenergistics2:sky_stone_block", "null"],
+    ["appliedenergistics2:sky_stone_block", "appliedenergistics2:sky_stone_block", "appliedenergistics2:sky_stone_block"],
+   ]);
+
+	// Quartz Stairs
+	event.remove({ output: "appliedenergistics2:quartz_stairs" });	
+    event.shaped(item.of("appliedenergistics2:quartz_stairs", 6), [
+    ["appliedenergistics2:quartz_block", null, null],
+    ["appliedenergistics2:quartz_block", "appliedenergistics2:quartz_block", null],
+    ["appliedenergistics2:quartz_block", "appliedenergistics2:quartz_block", "appliedenergistics2:quartz_block"],
+   ]);
+
+	// Quartz Pillar Stairs
+	event.remove({ output: "appliedenergistics2:quartz_pillar_stairs" });	
+    event.shaped(item.of("appliedenergistics2:quartz_pillar_stairs", 6), [
+   ["appliedenergistics2:quartz_pillar", null, null],
+   ["appliedenergistics2:quartz_pillar", "appliedenergistics2:quartz_pillar", null],
+   ["appliedenergistics2:quartz_pillar", "appliedenergistics2:quartz_pillar", "appliedenergistics2:quartz_pillar"],
+   ]);
+
+	// Chiseled Quartz Stairs
+	event.remove({ output: "appliedenergistics2:chiseled_quartz_stairs" });	
+    event.shaped(item.of("appliedenergistics2:chiseled_quartz_stairs", 6), [
+    ["appliedenergistics2:chiseled_quartz_block", null, null],
+    ["appliedenergistics2:chiseled_quartz_block", "appliedenergistics2:chiseled_quartz_block", "null"],
+    ["appliedenergistics2:chiseled_quartz_block", "appliedenergistics2:chiseled_quartz_block", "appliedenergistics2:chiseled_quartz_block"],
+   ]);
+});

kubejs/server_scripts/conflicts.js

@@ -10,7 +10,7 @@ events.listen("recipes", function (event) {
    event.shapeless('charm:spruce_barrel', ['minecraft:barrel'])
    event.shapeless('minecraft:barrel', ['charm:spruce_barrel'])
 
-  // Remove byg:gray_dye as it is a null tag, and this fixes the empty gray dye recipe
+  // Remove Empty Recipe - Trent87
   event.remove({ id: "byg:gray_dye" });
 
   // Gunpowder Block
@@ -98,12 +98,6 @@ events.listen("recipes", function (event) {
   // Chests
   event.replaceInput({}, "#c:wooden_chests", "#c:wooden_chests");
 
-  // Diamond Chain
-  event.replaceInput(
-    { id: "mochains:diamond_chain" },
-    "mochains:diamond_nugget",
-    "astromine:diamond_fragment"
-  );
 
   // Crafting Tables
   event.remove({ type: "crafting_shaped", output: "#c:workbench" });

kubejs/server_scripts/drinkbeer/shaped.js

@@ -0,0 +1,31 @@
+//╔════════════════════════════════════════╗
+//║     GNU Free Documentation License     ║
+//╚════════════════════════════════════════╝
+
+events.listen("recipes", function (event) {
+
+//╔════════════════════════════════════════╗
+//║              DRINK BEER                ║
+//╚════════════════════════════════════════╝
+
+	event.remove({ output: "drinkbeer:iron_call_bell" });
+	event.shaped(item.of("indrev:cooler_cell"), [
+	["#c:iron_nuggets",   "null", "null"],
+	["#c:iron_ingots" ,   "null", "null"],
+	["#minecraft:planks", "null", "null"],
+	]);
+
+	event.remove({ output: "drinkbeer:gold_call_bell" });
+	event.shaped(item.of("indrev:cooler_cell"), [
+	["minecraft:gold_nugget",   "null", "null"],
+	["minecraft:gold_ingot" ,   "null", "null"],
+	["#minecraft:planks",       "null", "null"],
+	]);
+
+	event.remove({ output: "drinkbeer:lekas_call_bell" });
+	event.shaped(item.of("indrev:cooler_cell"), [
+	["techreborn:copper_nugget",   "null", "null"],
+	["techreborn:copper_ingot" ,   "null", "null"],
+	["#minecraft:planks",          "null", "null"],
+	]);
+});

kubejs/server_scripts/expandedstorage/shapeless.js

@@ -0,0 +1,13 @@
+//╔════════════════════════════════════════╗
+//║     GNU Free Documentation License     ║
+//╚════════════════════════════════════════╝
+
+events.listen("recipes", function (event) {
+
+//╔════════════════════════════════════════╗
+//║         EXPANDEDSTORAGE/CHESTS         ║
+//╚════════════════════════════════════════╝
+
+	event.shapeless('expandedstorage:old_wood_chest', ['expandedstorage:wood_chest'])
+	event.shapeless('expandedstorage:wood_chest', ['expandedstorage:old_wood_chest']);
+});