Merge pull request #495 from Satherov/main

Minor fixes
AllTheMods · Sep 18, 2024 · 069a2c3 · 069a2c3
2 parents 2729e70 + b5c6cca
commit 069a2c3
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/config/advanced_ae-common.toml b/config/advanced_ae-common.toml
@@ -0,0 +1,19 @@
+["quantum computer"]
+	#Define the maximum dimensions of the Quantum Computer Multiblock.
+	#Range: 5 ~ 12
+	quantumComputerMaxSize = 7
+	#Define the maximum amount of multi threaders per Quantum Computer Multiblock.
+	#Range: 4 ~ 16
+	quantumComputerAcceleratorThreads = 12
+	#Define the maximum amount of multi threaders per Quantum Computer Multiblock.
+	#Range: 0 ~ 2
+	quantumComputerMaxMultiThreaders = 1
+	#Define the maximum amount of Data Entanglers per Quantum Computer Multiblock.
+	#Range: 0 ~ 2
+	quantumComputermaxDataEntanglers = 1
+	#Define the multiplication factor of the multi threaders.
+	#Range: 2 ~ 8
+	quantumComputerMultiThreaderMultiplication = 6
+	#Define the multiplication factor of the data entanglers.
+	#Range: 2 ~ 8
+	quantumComputerDataEntanglerMultiplication = 6
diff --git a/kubejs/server_scripts/Tweaks/tags.js b/kubejs/server_scripts/Tweaks/tags.js
@@ -1,4 +1,4 @@
-// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 9.
+// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 10.
 // As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.
 
 ServerEvents.tags('block', allthemods => {
@@ -14,5 +14,16 @@ ServerEvents.tags('item', allthemods => {
   allthemods.add('c:storage_blocks/yellorium', 'alltheores:uranium_block' )
 
 })
-// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 9.
+
+ServerEvents.tags('entity_type', allthemods => {
+  // Productive Bees
+  allthemods.add('justdirethings:paradox_deny', /productivebees:/);
+  allthemods.add('industrialforegoing:mob_duplicator_blacklist', /productivebees:/)
+
+  //AllTheModium
+  allthemods.add('justdirethings:paradox_deny', 'allthemodium:piglich');
+  allthemods.add('industrialforegoing:mob_duplicator_blacklist', 'allthemodium:piglich')
+
+});
+// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 10.
 // As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.
diff --git a/kubejs/server_scripts/modpack/att_items.js b/kubejs/server_scripts/modpack/att_items.js
@@ -8,7 +8,7 @@ ServerEvents.recipes(allthemods => {
     D: 'occultism:soul_gem',
     A: 'occultism:spawn_egg/familiar_dragon',
     S: 'productivetrees:socotra_dragon_sapling',
-    N: 'hostilenetworks:data_model[hostilenetworks:data_model="hostilenetworks:ender_dragon",hostilenetworks:data=1254]',
+    N: 'hostilenetworks:data_model[hostilenetworks:data_model="hostilenetworks:ender_dragon",hostilenetworks:data=1255]',
     I: 'allthemodium:piglich_heart_block',
     B: 'productivebees:spawn_egg_configurable_bee[entity_data={id:"productivebees:configurable_bee",type:"productivebees:soul_lava"}]',
 	  G: 'productivebees:inactive_dragon_egg',