Merge branch 'develop' of https://github.com/EnigmaticaModpacks/Enigm…

…atica9 into develop
EnigmaticaModpacks · Feb 27, 2023 · 4f07c88 · 4f07c88
2 parents bbfe57d + a5348d4
commit 4f07c88
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/config/ars_nouveau-server.toml b/config/ars_nouveau-server.toml
@@ -43,7 +43,3 @@
 	#Range: > 0
 	codexCost = 10
 
-[warp_portals]
-	#Enable warp portals?
-	enableWarpPortals = true
-
diff --git a/kubejs/server_scripts/base/loot_tables/chests/enigmatica/create_loot_boxes.js b/kubejs/server_scripts/base/loot_tables/chests/enigmatica/create_loot_boxes.js
@@ -3,12 +3,12 @@ ServerEvents.genericLootTables((event) => {
         table.addPool((pool) => {
             pool.rolls = 2.0;
             pool.addItem('create:super_glue', 1, 1);
-            pool.addItem('create:powered_toggle_latch', 1, 1);
-            pool.addItem('create:powered_latch', 1, 1);
-            pool.addItem('create:shaft', 1, 8);
-            pool.addItem('create:analog_lever', 1, 1);
-            pool.addItem('create:andesite_casing', 1, 8);
-            pool.addItem('create:belt_connector', 1, 4);
+            pool.addItem('create:powered_toggle_latch', 3, 1);
+            pool.addItem('create:powered_latch', 3, 1);
+            pool.addItem('create:shaft', 3, 8);
+            pool.addItem('create:analog_lever', 3, 1);
+            pool.addItem('create:andesite_casing', 3, 8);
+            pool.addItem('create:belt_connector', 3, 4);
         });
 
         table.addPool((pool) => {

diff --git a/kubejs/server_scripts/base/recipes/enigmatica/remove.js b/kubejs/server_scripts/base/recipes/enigmatica/remove.js
@@ -14,6 +14,9 @@ ServerEvents.recipes((event) => {
 
         { id: /ars_nouveau:.*_dye/ },
 
+        { id: 'create:compat/ae2/mixing/fluix_crystal' },
+        { id: 'create:compat/byg/crushing/lignite_ore' },
+
         { id: /createaddition:mixing\/biomass/ },
         { id: /createaddition:crafting\/.*spool/ },
         { id: 'createaddition:crafting/barbed_wire' },
@@ -31,26 +34,37 @@ ServerEvents.recipes((event) => {
         { id: 'createaddition:compat/ae2/charged_certus_quartz' },
         { id: 'createaddition:crafting/accumulator_conversion' },
 
+        { id: 'hexerei:black_dye_from_pestle_and_mortar' },
+
         { id: /mekanism:enriching\/dye/ },
         { id: /mekanism:compat\/byg\/dye/ },
         { id: /mekanism:compat\/byg\/sawing\/log/ },
         { id: /mekanism:sawing\/log/ },
         { id: /mekanism:compat\/byg\/combining\/.*_ore_/ },
         { id: /mekanism:bin\/.*/ },
         { id: /mekanism:crushing\/biofuel/ },
-        { id: 'mekanism:processing/netherite/dust_to_ancient_debris' },
         { id: /mekanism:processing\/.*\/ore\/.*from_raw$/ },
         { id: /mekanism:processing\/.*\/to_ore$/ },
         { id: /mekanism:processing\/.*\/to_deepslate_ore$/ },
+        { id: 'mekanism:processing/netherite/dust_to_ancient_debris' },
 
-        { id: 'quark:tweaks/smelting/bone_meal_utility' },
+        { id: 'minecraft:bone_meal' },
 
-        { id: 'create:compat/ae2/mixing/fluix_crystal' },
-        { id: 'create:compat/byg/crushing/lignite_ore' },
+        { id: 'occultism:crafting/butcher_knife' },
 
-        { id: 'hexerei:black_dye_from_pestle_and_mortar' },
+        { id: /pneumaticcraft:thermo_plant\/vegetable_oil_from_/ },
+        { id: /pneumaticcraft:thermo_plant\/ethanol_from_/ },
 
-        { id: 'occultism:crafting/butcher_knife' },
+        { id: /powah:smelting/ },
+        { id: /powah:energizing\/.*uraninite/ },
+        { id: /powah:crafting\/.*_starter/ },
+        { id: 'powah:energizing/blazing_crystal_2' },
+        { id: 'powah:crafting/energy_cell_basic_2' },
+        { id: 'powah:crafting/cable_basic_2' },
+        { id: 'powah:crafting/capacitor_basic' },
+        { id: 'powah:crafting/capacitor_basic_tiny' },
+
+        { id: 'quark:tweaks/smelting/bone_meal_utility' },
 
         { id: 'thermal:machines/centrifuge/centrifuge_allium' },
         { id: 'thermal:machines/centrifuge/centrifuge_azure_bluet' },
@@ -76,7 +90,6 @@ ServerEvents.recipes((event) => {
         { id: 'thermal:storage/rice_block' },
         { id: 'thermal:storage/onion_block' },
         { id: 'thermal:storage/hops_block' },
-
         { id: 'thermal:storage/tomato_from_block' },
         { id: 'thermal:storage/flax_from_block' },
         { id: 'thermal:storage/rice_from_block' },
@@ -105,19 +118,8 @@ ServerEvents.recipes((event) => {
         { id: 'thermal:compat/immersiveengineering/press_ie_hemp_to_plantoil' },
         { id: 'thermal:storage/sugar_cane_block' },
 
-        { id: /pneumaticcraft:thermo_plant\/vegetable_oil_from_/ },
-        { id: /pneumaticcraft:thermo_plant\/ethanol_from_/ },
-
-        { id: /powah:smelting/ },
-        { id: /powah:energizing\/.*uraninite/ },
-        { id: /powah:crafting\/.*_starter/ },
-        { id: 'powah:energizing/blazing_crystal_2' },
-        { id: 'powah:crafting/energy_cell_basic_2' },
-        { id: 'powah:crafting/cable_basic_2' },
-        { id: 'powah:crafting/capacitor_basic' },
-        { id: 'powah:crafting/capacitor_basic_tiny' },
-
         { type: 'create:cutting' },
+
         { type: 'createaddition:liquid_burning' },
 
         { type: 'farmersdelight:cutting', id: /wood/ },

diff --git a/kubejs/server_scripts/base/tags/entity_type/friendlyfire/general_protection.js b/kubejs/server_scripts/base/tags/entity_type/friendlyfire/general_protection.js
@@ -1,3 +1,5 @@
 ServerEvents.tags('entity_type', (event) => {
-    event.get('friendlyfire:general_protection').add([/occultism:.*familiar/, 'occultism:otherworld_bird']);
+    event
+        .get('friendlyfire:general_protection')
+        .add([/occultism:.*familiar/, 'occultism:otherworld_bird', /pneumaticcraft:.*drone/, '#ars_nouveau:familiar']);
 });