Merge pull request #453 from ghost/master

repair mistakes

config/conjuring.json5

@@ -13,7 +13,6 @@
 			"alaskanativecraft:moose",
 			"alaskanativecraft:ptarmigan",
 			"alaskanativecraft:seal",
-			"aqupd:caracal",
 			"artifacts:mimic",
 			"battletowers:tower_guardian",
 			"betterend:spawn_egg_cubozoa",

kubejs/assets/bambootweaks/blockstates/bamboo_wall_torch.json

@@ -0,0 +1,19 @@
+{
+	"variants": {
+		"facing=east": {
+			"model": "bambootweaks:block/bamboo_torch_wall"
+		},
+		"facing=south": {
+			"model": "bambootweaks:block/bamboo_torch_wall",
+			"y": 90
+		},
+		"facing=west": {
+			"model": "bambootweaks:block/bamboo_torch_wall",
+			"y": 180
+		},
+		"facing=north": {
+			"model": "bambootweaks:block/bamboo_torch_wall",
+			"y": 270
+		}
+	}
+}

kubejs/assets/bambootweaks/blockstates/dry_bamboo_wall_torch.json

@@ -0,0 +1,19 @@
+{
+	"variants": {
+		"facing=east": {
+			"model": "bambootweaks:block/dry_bamboo_torch_wall"
+		},
+		"facing=south": {
+			"model": "bambootweaks:block/dry_bamboo_torch_wall",
+			"y": 90
+		},
+		"facing=west": {
+			"model": "bambootweaks:block/dry_bamboo_torch_wall",
+			"y": 180
+		},
+		"facing=north": {
+			"model": "bambootweaks:block/dry_bamboo_torch_wall",
+			"y": 270
+		}
+	}
+}

kubejs/assets/carrier/lang/en_us.json

@@ -0,0 +1,4 @@
+{
+	"category.carrier":"Carrier",
+	"carrier.key":"Toggle Carrier"
+}

kubejs/assets/golemsgalore/lang/en_us.json

@@ -1,8 +1,5 @@
 {
  "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"
+ "entity.golemsgalore.diamond_laser_golem":"Diamond Laser Golem"
 }

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

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

kubejs/assets/mocolors/lang/en_us.json

@@ -2,5 +2,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"
+	"block.mocolors.colored_glass":"Colored Glass",
+	"block.mocolors.colored_slime":"Colored Slime Block"
 }

kubejs/assets/mocolors/lang/pl_pl.json

@@ -2,5 +2,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"
+	"block.mocolors.colored_glass":"Kolorowe Szkło",
+	"block.mocolors.colored_slime":"Kolorowy Blok Szlamu"
 }

kubejs/assets/winged/lang/en_us.json

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

kubejs/server_scripts/appliedenergistic2/missings.js

@@ -1,13 +1,5 @@
-//╔════════════════════════════════════════╗
-//║     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), [
@@ -55,11 +47,7 @@ events.listen("recipes", function (event) {
     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), [

kubejs/server_scripts/balancing.js

@@ -20,13 +20,13 @@ events.listen("recipes", function (event) {
     ['minecraft:end_crystal', 'minecraft:nether_star', 'minecraft:dragon_breath'],
   ]);
 
-    // Master Infusion Crystal
-    event.remove({ output: "mysticalagriculture:master_infusion_crystal" });
-    event.shaped(item.of("mysticalagriculture:master_infusion_crystal"), [
-      ['mysticalagriculture:supremium_ingot', 'mysticalagriculture:infusion_crystal',         'mysticalagriculture:supremium_ingot'],
-      ['mysticalagriculture:infusion_crystal', 'mysticalagriculture:supremium_gemstone_block', 'mysticalagriculture:infusion_crystal'],
-      ['mysticalagriculture:supremium_ingot', 'mysticalagriculture:infusion_crystal', 'mysticalagriculture:supremium_ingot'],
-    ]);
+  // Master Infusion Crystal
+  event.remove({ output: "mysticalagriculture:master_infusion_crystal" });
+  event.shaped(item.of("mysticalagriculture:master_infusion_crystal"), [
+    ['mysticalagriculture:supremium_ingot', 'mysticalagriculture:infusion_crystal',         'mysticalagriculture:supremium_ingot'],
+    ['mysticalagriculture:infusion_crystal', 'mysticalagriculture:supremium_gemstone_block', 'mysticalagriculture:infusion_crystal'],
+    ['mysticalagriculture:supremium_ingot', 'mysticalagriculture:infusion_crystal', 'mysticalagriculture:supremium_ingot'],
+  ]);
 
 
   // Quantum Suit
@@ -65,15 +65,15 @@ events.listen("recipes", function (event) {
   event.remove({ id: "vanilla-hammers:obsidian_hammer" });
   event.remove({ id: "vanilla-excavators:obsidian_excavator" });
 
-    // Light Ring
-    event.remove({ output: "kibe:light_ring" });
-    event.shaped(item.of("kibe:light_ring"), [
-      ["iron-jetpacks:diamond_capacitor",            "modern_industrialization:tank_stainless_steel", "iron-jetpacks:diamond_capacitor"],
-      ["modern_industrialization:bucket_light_fuel", "kibe:diamond_ring",                             "modern_industrialization:bucket_light_fuel"],
-      ["iron-jetpacks:diamond_capacitor",            "modern_industrialization:tank_stainless_steel", "iron-jetpacks:diamond_capacitor"],
-    ]);
+  // Light Ring
+  event.remove({ output: "kibe:light_ring" });
+  event.shaped(item.of("kibe:light_ring"), [
+    ["iron-jetpacks:diamond_capacitor",            "modern_industrialization:tank_stainless_steel", "iron-jetpacks:diamond_capacitor"],
+    ["modern_industrialization:bucket_light_fuel", "kibe:diamond_ring",                             "modern_industrialization:bucket_light_fuel"],
+    ["iron-jetpacks:diamond_capacitor",            "modern_industrialization:tank_stainless_steel", "iron-jetpacks:diamond_capacitor"],
+  ]);
 
-      //Gem Tools & Gear
+  //Gem Tools & Gear
   var gems = [
     "ruby",
     "sapphire",
@@ -88,12 +88,12 @@ events.listen("recipes", function (event) {
     event.remove({ output: "techreborn:" + item + "_sword"});
   });
 
-    // Minecart in Rolling Machine
-    event.remove({ id: "techreborn:rolling_machine/minecart" });
+  // Minecart in Rolling Machine
+  event.remove({ id: "techreborn:rolling_machine/minecart" });
 
-    // MRE
+  // MRE
   event.remove({ output: "campanion:mre" });
 
-    // Remove boss key
+  // Remove Boss Key
   event.remove({ output: "battletowers:boss_key" });
 });

kubejs/server_scripts/expandedstorage/shapeless.js

@@ -1,13 +1,5 @@
-//╔════════════════════════════════════════╗
-//║     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']);
 });

kubejs/server_scripts/kibe/shaped.js

@@ -1,12 +1,5 @@
-//╔════════════════════════════════════════╗
-//║     GNU Free Documentation License     ║
-//╚════════════════════════════════════════╝
 events.listen("recipes", function (event) {
 
-//╔════════════════════════════════════════╗
-//║              KIBE/LASSO                ║
-//╚════════════════════════════════════════╝
-
 	// Cursed Lasso
 	event.remove({ output: "kibe:cursed_lasso" });	
 	event.shaped(item.of("kibe:cursed_lasso"), [ 
@@ -31,42 +24,11 @@ events.listen("recipes", function (event) {
 	["mysticalagriculture:chicken_essence" , "mysticalagriculture:ghast_essence", "mysticalagriculture:chicken_essence"],
 	]);
 
-//╔════════════════════════════════════════╗
-//║              KIBE/RINGS                ║
-//╚════════════════════════════════════════╝
-//
-//	// Angel Ring
-//	event.remove({ output: "kibe:angel_ring" });	
-//	event.shaped(item.of("kibe:angel_ring"), [ 
-//	["winged:angel_feather", "minecraft:elytra"                   , "winged:angel_feather"],
-//	["modern_industrialization:iron_gear"  , "modern_industrialization:air_intake", "modern_industrialization:iron_gear"  ],
-//	["kibe:diamond_ring"   , "indrev:module_feather_falling"      , "kibe:diamond_ring"   ],
-//	]);
-//	
-//	// Light Ring
-//	event.remove({ output: "kibe:light_ring" });	
-//	event.shaped(item.of("kibe:light_ring"), [
-//	["modern_industrialization:gold_curved_plate", "kibe:diamond_ring", "modern_industrialization:gold_curved_plate"],
-//	["kibe:golden_lasso", "modern_industrialization:bucket_light_fuel", "kibe:golden_lasso"  ],
-//	["minecraft:gold_ingot", "modern_industrialization:lv_circuit_board" , "minecraft:gold_ingot"],
-//	]);
-//	
-//	// Diamond Ring
-//	event.remove({ output: "kibe:diamond_ring" });	
-//	event.shaped(item.of("kibe:diamond_ring"), [
-//	["minecraft:diamond", "modern_industrialization:gold_crushed_dust", "minecraft:diamond"],
-//	["modern_industrialization:gold_crushed_dust", "mysticalagriculture:gold_essence","modern_industrialization:gold_crushed_dust"],
-//	["minecraft:diamond", "modern_industrialization:gold_crushed_dust", "minecraft:diamond"],
-//	]);
-//
-//╔════════════════════════════════════════╗
-//║              KIBE/MAGNET               ║
-//╚════════════════════════════════════════╝
-
-  event.remove({ output: "kibe:magnet" });	
-  event.shaped(item.of("kibe:magnet"), [
-	["minecraft:red_dye"             , "#minecraft:beacon_payment_items", "#minecraft:beacon_payment_items"],
-	["#minecraft:beacon_payment_items", "minecraft:ender_eye"           , "null"                           ],
-	["minecraft:red_dye"             , "#minecraft:beacon_payment_items", "#minecraft:beacon_payment_items"],
-  ]);
+ 	// Kibe Magnet 
+    event.remove({ output: "kibe:magnet" });	
+    event.shaped(item.of("kibe:magnet"), [
+    ["minecraft:red_dye"             , "#minecraft:beacon_payment_items", "#minecraft:beacon_payment_items"],
+    ["#minecraft:beacon_payment_items", "minecraft:ender_eye"           , "null"                           ],
+    ["minecraft:red_dye"             , "#minecraft:beacon_payment_items", "#minecraft:beacon_payment_items"],
+    ]);
 })

kubejs/server_scripts/minecraft/blasting/materials.js

@@ -1,9 +1,6 @@
 events.listen("recipes", function (event) {
 
-//╔════════════════════════════════════════╗
-//║             ROTTEN FLESH               ║
-//╚════════════════════════════════════════╝
-
+  // Rotten Flesh
 	event.recipes.minecraft.blasting(item.of('minecraft:leather'), 'minecraft:rotten_flesh')
 })
 

kubejs/server_scripts/minecraft/shaped.js → kubejs/server_scripts/minecraft/examples

@@ -1,23 +1,8 @@
-//priority: 888
 
-settings.logAddedRecipes = true
-settings.logRemovedRecipes = true
-settings.logSkippedRecipes = false
-settings.logErroringRecipes = true
-
-//╔════════════════════════════════════════╗
-//║     GNU Free Documentation License     ║
-//╚════════════════════════════════════════╝
 events.listen("recipes", function (event) {
-
-//╔════════════════════════════════════════╗
-//║              SPAWN EGGS                ║
-//╚════════════════════════════════════════╝
 
-//╔════════════════════════════════════════╗
-//║               SPAWNER                  ║
-//╚════════════════════════════════════════╝
-
+// Spawners
+
 	event.remove({ output: "minecraft:spawner" });
 	event.shaped(item.of("minecraft:spawner", 2), [
 	["minecraft:netherite_ingot", "minecraft:netherite_ingot", "minecraft:netherite_ingot"],
@@ -32,9 +17,9 @@ events.listen("recipes", function (event) {
 	["minecraft:netherite_block", "minecraft:netherite_block", "minecraft:netherite_block"],
 	]);
 
-//╔════════════════════════════════════════╗
-//║           SPAWN EGGS RECIPES           ║
-//╚════════════════════════════════════════╝
+
+// Spawn Eggs
+
 
 	// zombie_spawn_egg //
 

kubejs/server_scripts/minecraft/smelting/materials.js

@@ -1,9 +1,6 @@
 events.listen("recipes", function (event) {
-
-//╔════════════════════════════════════════╗
-//║             ROTTEN FLESH               ║
-//╚════════════════════════════════════════╝
-
+
+  // Rotten Flesh
    event.smelting('minecraft:leather', 'minecraft:rotten_flesh').xp(0.1);
 })