diff --git a/automation/settings.ps1 b/automation/settings.ps1 index f348281383..a932617fdd 100644 --- a/automation/settings.ps1 +++ b/automation/settings.ps1 @@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica6" $CLIENT_NAME = "Enigmatica6" # Version Of The Modpack -$MODPACK_VERSION = "0.5.17" +$MODPACK_VERSION = "0.5.18" # Last Version Of The Modpack # Needed For Changelog Parsing -$LAST_MODPACK_VERSION = "0.5.16" +$LAST_MODPACK_VERSION = "0.5.17" # =====================================================================// # CHANGELOG SETTINGS diff --git a/config/Mekanism/general.toml b/config/Mekanism/general.toml index 6801af2bcc..5bfb6488c0 100644 --- a/config/Mekanism/general.toml +++ b/config/Mekanism/general.toml @@ -7,7 +7,7 @@ #Peak processing rate for the Solar Neutron Activator. Note: It can go higher than this value in some extreme environments. maxSolarNeutronActivatorRate = 64 #Any mod ids added to this list will not be able to have any of their blocks, picked up by the cardboard box. For example: ["mekanism"] - cardboardModBlacklist = ["refinedstorage", "tetra", "storagedrawers", "lootr", "extrastorage", "astralsorcery", "waystones", "powah"] + cardboardModBlacklist = ["refinedstorage", "tetra", "storagedrawers", "lootr", "extrastorage", "astralsorcery", "waystones", "powah", "pneumaticcraft"] #Disable to make the anchor upgrade not do anything. allowChunkloading = true #How much heat energy is created from one Joule of regular energy in the Resistive Heater. diff --git a/config/ars_nouveau-common-1.toml.bak b/config/ars_nouveau-common-1.toml.bak deleted file mode 100644 index 1e6ec5ff6c..0000000000 --- a/config/ars_nouveau-common-1.toml.bak +++ /dev/null @@ -1,83 +0,0 @@ - -#General settings -[general] - #How often Sylphs spawn - #Range: 0 ~ 100 - sylphWeight = 5 - #Spawn Arcane Ore in the world - genOre = false - #Spawn a book in the players inventory on login - spawnBook = false - #Spawn Mana Berry Bushes in the world - genBerries = true - #How often Carbuncles spawn - #Range: 0 ~ 100 - carbuncleWeight = 5 - #Rate of tree spawn per chunk - #Range: 0.0 ~ 1.0 - genTrees = 0.002 - #How often Wilden Guardians spawn - #Range: 0 ~ 200 - wguardianWeight = 8 - #How often Wilden Stalkers spawn - #Range: 0 ~ 200 - wstalkerWeight = 8 - #How often Wilden Hunter spawn - #Range: 0 ~ 200 - whunterWeight = 8 - #Should the Wilden Hunter attack animals? - hunterHuntsAnimals = true - #Should the Wilden Stalker attack animals? - stalkerHuntsAnimals = false - #Should the Wilden Defender attack animals? - defenderHuntsAnimals = false - #Dimensions where hostile mobs will not spawn. Ex: ["minecraft:overworld", "undergarden:undergarden"]. . Run /forge dimensions for a list. - dimensionBlacklist = ["compactmachines:compact_world", "atum:atum", "mythicbotany:alfheim", "undergarden:undergarden"] - #Archwood forest spawn weight - #Range: > 0 - archwoodForest = 3 - #Crystallizer output item. Do not use a wrong ID! - crystallizer_output = "emendatusenigmatica:arcane_gem" - #How often Drygmys spawn - #Range: 0 ~ 100 - drygmyWeight = 3 - #How much mana drygmys consume per generation - #Range: 0 ~ 10000 - drygmyManaCost = 8000 - #How much mana sylphs consume per generation - #Range: 0 ~ 10000 - sylphManaCost = 2000 - #How many channels must occur before a drygmy produces loot - #Range: 0 ~ 300 - drygmyMaxProgress = 15 - -#Mana -[mana] - #Base mana regen in seconds - #Range: > 0 - baseRegen = 5 - #Max mana bonus for tier of book - #Range: > 0 - tierMax = 50 - #How often max and regen will be calculated, in ticks. NOTE: Having the base mana regen AT LEAST this value is recommended. - #Range: 1 ~ 20 - updateInterval = 5 - #Mana Boost value per level - #Range: > 0 - manaBoost = 25 - #Regen bonus per potion level - #Range: > 0 - potionRegen = 10 - #Max mana bonus per glyph - #Range: > 0 - glyphmax = 15 - #(enchantment) Mana regen per second per level - #Range: > 0 - manaRegenEnchantment = 2 - #Base max mana - #Range: > 0 - baseMax = 100 - #Regen bonus per glyph - #Range: 0.0 ~ 2.147483647E9 - glyphRegen = 0.33 - diff --git a/config/chiselsandbits-client.toml b/config/chiselsandbits-client.toml new file mode 100644 index 0000000000..28a3880cad --- /dev/null +++ b/config/chiselsandbits-client.toml @@ -0,0 +1,76 @@ + +#Gameplay settings +[settings] + + #Bit-Bag settings + [settings.bit-bag] + #Should the durability bar display the emptiness of the bag instead of the fullness? + invert-durability-bar-indication = false + + #Configures the tool mode icons used to render the selected tool modes of tools in the hot bar. + [settings.selected-tool-mode-icons] + #Sets which tool mode icon renderer is in use. Currently C&B provides: `chiselsandbits:group` (Render the group icon in the top right corner) and `chiselsandbits:noop` (No icon) as options. + renderer = "chiselsandbits:group" + + #Configures the chiseling and placement previews. + [settings.chiseling-previews] + #Sets which preview renderer is in use. Currently C&B provides: `chiselsandbits:default` (Simple outline rendering) and `chiselsandbits:noop` (No preview) as options. + renderer = "chiselsandbits:default" + + #Configures the default chiseling and placement preview. + [settings.chiseling-previews.default] + + #Configures the colors of the outlines that the chiseling and placement preview have. + [settings.chiseling-previews.default.colors] + #The color for the chiseling preview outline. + chiseling = [0.85, 0.0, 0.0, 0.65] + #The color for the placement preview outline. + placement = [0.0, 0.85, 0.0, 0.65] + +#Performance related options. +[performance] + + #Configures caches + [performance.caches] + + #Cache size related options. + [performance.caches.sizes] + #Size of the bit storage inner models cache. + #Range: 0 ~ 9223372036854775807 + bit-storage-content-models = 100 + #Size of the block model cache. + #Range: 3500 ~ 20000 + block-models = 10000 + #Size of the model face cache. + #Range: 3500 ~ 20000 + block-faces = 10000 + + #Options related to the building of the chiseled block models. + [performance.model-building] + #How many CPU threads should be used to build models? + #Range: 1 ~ 4 + thead-count = 2 + + #Lighting related options. + [performance.lighting] + #Should C&B pull lighting values from model faces. + extract-lighting-values-from-faces = true + #Should C&B pull lighting values from blockstates. + extract-lighting-values-from-blockstates = true + +#Options for the GUI +[gui] + + #Options for the radial menu. + [gui.radial-menu] + #Should the mouse indicator be rendered? + display-mouse-indicator = false + +#Configures options related to different compatibility modules. +[compat] + + #Compatibility options for JEI. + [compat.jei] + #Should C&B inject its bits into JEI? + inject-bits = false + diff --git a/config/chiselsandbits-common.toml b/config/chiselsandbits-common.toml index afba036604..12fd3ac4a9 100644 --- a/config/chiselsandbits-common.toml +++ b/config/chiselsandbits-common.toml @@ -1,28 +1,18 @@ -[common] - - #Configuration entries related to the help system. - [common.help] - - [common.help.common] - - [common.help.common.help] - #Common configuration entries related to the help system and which features are enabled or not during displayment. - enabled = true - - [common.common] - - #Configuration entries related to performance. - [common.common.performance] - - [common.common.performance.common] - - [common.common.performance.common.performance] - - [common.common.performance.common.performance.collisions] - - [common.common.performance.common.performance.collisions.cache] - #common.performance.collisions.cache.size - #Range: -9223372036854775808 ~ 9223372036854775807 - size = 10000 +#Options for getting help in game. +[help] + #Should the help information be visible in tooltips? + enabled-in-tooltips = true + +#Performance related options. +[performance] + + #Configures caches + [performance.caches] + + #Cache size related options. + [performance.caches.sizes] + #Size of the collision box cache. + #Range: -9223372036854775808 ~ 9223372036854775807 + collision-boxes = 10000 diff --git a/config/configswapper/expert/config/mininggadgets-common.toml b/config/configswapper/expert/config/mininggadgets-common.toml new file mode 100644 index 0000000000..203e198582 --- /dev/null +++ b/config/configswapper/expert/config/mininggadgets-common.toml @@ -0,0 +1,62 @@ + +#Upgrade Cost Settings +[power.upgrades] + #Cost per Light Block placed + #Range: > 0 + upgradeLight = 500 + #Cost per block for Silk Touch upgrade + #Range: > 0 + upgradeSilkCost = 5000 + #Cost per block Frozen + #Range: > 0 + upgradeFreeze = 500 + #Cost per block for Fortune 1 upgrade + #Range: > 0 + upgradeFortune1 = 1000 + #Cost per block for Fortune 2 upgrade + #Range: > 0 + upgradeFortune2 = 4000 + #Cost per block for Fortune 3 upgrade + #Range: > 0 + upgradeFortune3 = 6000 + #Capacity Boost from Battery 1 Upgrade + #Range: > 0 + battery1 = 4800000 + #Capacity Boost from Battery 2 Upgrade + #Range: > 0 + battery2 = 19200000 + #Capacity Boost from Battery 3 Upgrade + #Range: > 0 + battery3 = 76800000 + #Cost per block for Efficiency 1 upgrade + #Range: > 0 + upgradeEfficiency1 = 100 + #Cost per block for Efficiency 2 upgrade + #Range: > 0 + upgradeEfficiency2 = 200 + #Cost per block for Efficiency 3 upgrade + #Range: > 0 + upgradeEfficiency3 = 450 + #Cost per block for Efficiency 4 upgrade + #Range: > 0 + upgradeEfficiency4 = 1200 + #Cost per block for Efficiency 5 upgrade + #Range: > 0 + upgradeEfficiency5 = 3500 + #Cost per block for Magnet upgrade + #Range: > 0 + upgradeMagnet = 250 + #Cost per block for Void Junk upgrade + #Range: > 0 + upgradeVoid = 100 + + +#Mining Gadget Settings +[power.mining_gadget] + #Base cost per block broken + #Range: > 0 + baseCost = 1000 + #Maximum power for the Mining Gadget + #Range: > 0 + maxPower = 500000 + diff --git a/config/configswapper/normal/config/mininggadgets-common.toml b/config/configswapper/normal/config/mininggadgets-common.toml new file mode 100644 index 0000000000..3795135810 --- /dev/null +++ b/config/configswapper/normal/config/mininggadgets-common.toml @@ -0,0 +1,62 @@ + +#Upgrade Cost Settings +[power.upgrades] + #Cost per Light Block placed + #Range: > 0 + upgradeLight = 100 + #Cost per block for Silk Touch upgrade + #Range: > 0 + upgradeSilkCost = 100 + #Cost per block Frozen + #Range: > 0 + upgradeFreeze = 100 + #Cost per block for Fortune 1 upgrade + #Range: > 0 + upgradeFortune1 = 30 + #Cost per block for Fortune 2 upgrade + #Range: > 0 + upgradeFortune2 = 60 + #Cost per block for Fortune 3 upgrade + #Range: > 0 + upgradeFortune3 = 100 + #Capacity Boost from Battery 1 Upgrade + #Range: > 0 + battery1 = 2000000 + #Capacity Boost from Battery 2 Upgrade + #Range: > 0 + battery2 = 5000000 + #Capacity Boost from Battery 3 Upgrade + #Range: > 0 + battery3 = 10000000 + #Cost per block for Efficiency 1 upgrade + #Range: > 0 + upgradeEfficiency1 = 10 + #Cost per block for Efficiency 2 upgrade + #Range: > 0 + upgradeEfficiency2 = 20 + #Cost per block for Efficiency 3 upgrade + #Range: > 0 + upgradeEfficiency3 = 30 + #Cost per block for Efficiency 4 upgrade + #Range: > 0 + upgradeEfficiency4 = 40 + #Cost per block for Efficiency 5 upgrade + #Range: > 0 + upgradeEfficiency5 = 50 + #Cost per block for Magnet upgrade + #Range: > 0 + upgradeMagnet = 25 + #Cost per block for Void Junk upgrade + #Range: > 0 + upgradeVoid = 10 + + +#Mining Gadget Settings +[power.mining_gadget] + #Base cost per block broken + #Range: > 0 + baseCost = 200 + #Maximum power for the Mining Gadget + #Range: > 0 + maxPower = 1000000 + diff --git a/config/connectivity-common.toml b/config/connectivity-common.toml index 6e9b5c3372..3b9a0b0f76 100644 --- a/config/connectivity-common.toml +++ b/config/connectivity-common.toml @@ -4,7 +4,7 @@ disableLoginLimits = true #Should play packet size limits be disabled? Error:(Badly compressed packet) default:true disablePacketLimits = true - #If enabled all messages exceeding normal limits will be printed to log. default:false + #If enabled all packets exceeding normal limits will be printed to log. default:false debugPrintMessages = false #Set the max login timeout in ticks. 20 ticks = 1 sec, default = 120 seconds #Range: 600 ~ 20000 diff --git a/config/dungeons_plus-common.toml b/config/dungeons_plus-common.toml index ec76ceff2c..9a986568b5 100644 --- a/config/dungeons_plus-common.toml +++ b/config/dungeons_plus-common.toml @@ -1,113 +1,113 @@ [tower] - #Spacing between structures + #The average distance between structures of this type, measured in chunks. #Range: > 1 spacing = 25 - #Offsets the spacing of the structures randomly + #A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random. #Range: > 0 offset = 6 - #How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite. + #How the biomes list should be used. true = whitelist, false = blacklist. is_whitelist = true - #A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. + #A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. biomes = "#structure_gel:plains, #structure_gel:oak_forest, #structure_gel:dark_forest, #structure_gel:birch_forest, #structure_gel:mountain" - #Chance of generating in an allowed chunk + #Percent chance of generating in an allowed chunk. #Range: 0.0 ~ 1.0 probability = 0.75 #What dimensions should this structure be placed in. Type "all" to allow all dimensions valid_dimensions = "minecraft:overworld" [leviathan] - #Spacing between structures + #The average distance between structures of this type, measured in chunks. #Range: > 1 spacing = 36 - #Offsets the spacing of the structures randomly + #A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random. #Range: > 0 offset = 8 - #How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite. + #How the biomes list should be used. true = whitelist, false = blacklist. is_whitelist = true - #A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. + #A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. biomes = "#structure_gel:desert" - #Chance of generating in an allowed chunk + #Percent chance of generating in an allowed chunk. #Range: 0.0 ~ 1.0 probability = 1.0 #What dimensions should this structure be placed in. Type "all" to allow all dimensions valid_dimensions = "minecraft:overworld" [snowy_temple] - #Spacing between structures + #The average distance between structures of this type, measured in chunks. #Range: > 1 spacing = 36 - #Offsets the spacing of the structures randomly + #A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random. #Range: > 0 offset = 8 - #How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite. + #How the biomes list should be used. true = whitelist, false = blacklist. is_whitelist = true - #A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. + #A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. biomes = "#structure_gel:snowy_plains, #structure_gel:snowy_spruce_forest" - #Chance of generating in an allowed chunk + #Percent chance of generating in an allowed chunk. #Range: 0.0 ~ 1.0 probability = 1.0 #What dimensions should this structure be placed in. Type "all" to allow all dimensions valid_dimensions = "minecraft:overworld" [bigger_dungeon] - #Spacing between structures + #The average distance between structures of this type, measured in chunks. #Range: > 1 spacing = 12 - #Offsets the spacing of the structures randomly + #A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random. #Range: > 0 offset = 5 - #How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite. + #How the biomes list should be used. true = whitelist, false = blacklist. is_whitelist = true - #A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. + #A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. biomes = "#structure_gel:overworld, !mushroom_fields, !mushroom_field_shore" - #Chance of generating in an allowed chunk + #Percent chance of generating in an allowed chunk. #Range: 0.0 ~ 1.0 probability = 0.4 #What dimensions should this structure be placed in. Type "all" to allow all dimensions valid_dimensions = "minecraft:overworld" [end_ruins] - #Spacing between structures + #The average distance between structures of this type, measured in chunks. #Range: > 1 spacing = 24 - #Offsets the spacing of the structures randomly + #A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random. #Range: > 0 offset = 8 - #How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite. + #How the biomes list should be used. true = whitelist, false = blacklist. is_whitelist = true - #A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. + #A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. biomes = "#structure_gel:outer_end_island" - #Chance of generating in an allowed chunk + #Percent chance of generating in an allowed chunk. #Range: 0.0 ~ 1.0 probability = 0.8 #What dimensions should this structure be placed in. Type "all" to allow all dimensions valid_dimensions = "minecraft:the_end" [warped_garden] - #Spacing between structures + #The average distance between structures of this type, measured in chunks. #Range: > 1 spacing = 36 - #Offsets the spacing of the structures randomly + #A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random. #Range: > 0 offset = 8 - #How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite. + #How the biomes list should be used. true = whitelist, false = blacklist. is_whitelist = true - #A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. + #A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. biomes = "#structure_gel:ocean, !#structure_gel:frozen" #What dimensions should this structure be placed in. Type "all" to allow all dimensions valid_dimensions = "minecraft:overworld" [soul_prison] - #Spacing between structures + #The average distance between structures of this type, measured in chunks. #Range: > 1 spacing = 25 - #Offsets the spacing of the structures randomly + #A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random. #Range: > 0 offset = 6 - #How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite. + #How the biomes list should be used. true = whitelist, false = blacklist. is_whitelist = true - #A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. + #A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest. biomes = "minecraft:soul_sand_valley" #What dimensions should this structure be placed in. Type "all" to allow all dimensions valid_dimensions = "minecraft:the_nether" diff --git a/config/emendatusenigmatica-common.toml b/config/emendatusenigmatica-common.toml index de2bbfc649..43ab8db2fb 100644 --- a/config/emendatusenigmatica-common.toml +++ b/config/emendatusenigmatica-common.toml @@ -1911,3 +1911,198 @@ ["Stratum Config: quark_deepslate"] active = true +["Ruby Config"] + + ["Ruby Config".Overworld] + #Activate/Deactivate the Ore Gen in The Overworld [Default: true] + generate_in_the_overworld = false + #Baseline Y-Level [Default: 20] + #Range: 0 ~ 256 + overworld_base = 20 + #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 1] + #Range: 0 ~ 256 + overworld_spread = 1 + #Average Ores per Chunk [Default: 8] + #Range: 0 ~ 64 + overworld_count = 8 + #Configure the ore Vein Size [Default: 12] + #Range: 0 ~ 64 + overworld_size = 12 + #List of biome IDs in which the ore is not allowed to generate. + #To blacklist all biomes from a single mod, use 'modid:*' + overworld_biome_blacklist = [] + #Invert Blacklist to Whitelist [Default: false] + overworld_biome_list_invert = false + + ["Ruby Config"."The Nether"] + #Activate/Deactivate the Ore Gen in The Nether [Default: false] + generate_in_the_nether = false + #Baseline Y-Level [Default: 50] + #Range: 0 ~ 128 + nether_base = 50 + #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 1] + #Range: 0 ~ 128 + nether_spread = 1 + #Average Ores per Chunk [Default: 8] + #Range: 0 ~ 64 + nether_count = 8 + #Ore Vein Size [Default: 12] + #Range: 0 ~ 64 + nether_size = 12 + #List of biome IDs in which the ore is not allowed to generate. + #To blacklist all biomes from a single mod, use 'modid:*' + nether_biome_blacklist = [] + #Invert Blacklist to Whitelist [Default: false] + nether_biome_list_invert = false + + ["Ruby Config"."The End"] + #Activate/Deactivate the Ore Gen in The End [Default: false] + generate_in_the_end = false + #Baseline Y-Level [Default: 40] + #Range: 0 ~ 256 + end_base = 40 + #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 1] + #Range: 0 ~ 256 + end_spread = 1 + #Average Ores per Chunk [Default: 8] + #Range: 0 ~ 64 + end_count = 8 + #Ore Vein Size [Default: 12] + #Range: 0 ~ 64 + end_size = 12 + #List of biome IDs in which the ore is not allowed to generate. + #To blacklist all biomes from a single mod, use 'modid:*' + end_biome_blacklist = [] + #Invert Blacklist to Whitelist [Default: false] + end_biome_list_invert = false + +["Sapphire Config"] + + ["Sapphire Config".Overworld] + #Activate/Deactivate the Ore Gen in The Overworld [Default: true] + generate_in_the_overworld = false + #Baseline Y-Level [Default: 20] + #Range: 0 ~ 256 + overworld_base = 20 + #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 1] + #Range: 0 ~ 256 + overworld_spread = 1 + #Average Ores per Chunk [Default: 8] + #Range: 0 ~ 64 + overworld_count = 8 + #Configure the ore Vein Size [Default: 12] + #Range: 0 ~ 64 + overworld_size = 12 + #List of biome IDs in which the ore is not allowed to generate. + #To blacklist all biomes from a single mod, use 'modid:*' + overworld_biome_blacklist = [] + #Invert Blacklist to Whitelist [Default: false] + overworld_biome_list_invert = false + + ["Sapphire Config"."The Nether"] + #Activate/Deactivate the Ore Gen in The Nether [Default: false] + generate_in_the_nether = false + #Baseline Y-Level [Default: 50] + #Range: 0 ~ 128 + nether_base = 50 + #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 1] + #Range: 0 ~ 128 + nether_spread = 1 + #Average Ores per Chunk [Default: 8] + #Range: 0 ~ 64 + nether_count = 8 + #Ore Vein Size [Default: 12] + #Range: 0 ~ 64 + nether_size = 12 + #List of biome IDs in which the ore is not allowed to generate. + #To blacklist all biomes from a single mod, use 'modid:*' + nether_biome_blacklist = [] + #Invert Blacklist to Whitelist [Default: false] + nether_biome_list_invert = false + + ["Sapphire Config"."The End"] + #Activate/Deactivate the Ore Gen in The End [Default: false] + generate_in_the_end = false + #Baseline Y-Level [Default: 40] + #Range: 0 ~ 256 + end_base = 40 + #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 1] + #Range: 0 ~ 256 + end_spread = 1 + #Average Ores per Chunk [Default: 8] + #Range: 0 ~ 64 + end_count = 8 + #Ore Vein Size [Default: 12] + #Range: 0 ~ 64 + end_size = 12 + #List of biome IDs in which the ore is not allowed to generate. + #To blacklist all biomes from a single mod, use 'modid:*' + end_biome_blacklist = [] + #Invert Blacklist to Whitelist [Default: false] + end_biome_list_invert = false + +["Iridium Config"] + + ["Iridium Config".Overworld] + #Activate/Deactivate the Ore Gen in The Overworld [Default: true] + generate_in_the_overworld = false + #Baseline Y-Level [Default: 12] + #Range: 0 ~ 256 + overworld_base = 12 + #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 8] + #Range: 0 ~ 256 + overworld_spread = 8 + #Average Ores per Chunk [Default: 6] + #Range: 0 ~ 64 + overworld_count = 6 + #Configure the ore Vein Size [Default: 6] + #Range: 0 ~ 64 + overworld_size = 6 + #List of biome IDs in which the ore is not allowed to generate. + #To blacklist all biomes from a single mod, use 'modid:*' + overworld_biome_blacklist = [] + #Invert Blacklist to Whitelist [Default: false] + overworld_biome_list_invert = false + + ["Iridium Config"."The Nether"] + #Activate/Deactivate the Ore Gen in The Nether [Default: false] + generate_in_the_nether = false + #Baseline Y-Level [Default: 42] + #Range: 0 ~ 128 + nether_base = 42 + #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 8] + #Range: 0 ~ 128 + nether_spread = 8 + #Average Ores per Chunk [Default: 6] + #Range: 0 ~ 64 + nether_count = 6 + #Ore Vein Size [Default: 6] + #Range: 0 ~ 64 + nether_size = 6 + #List of biome IDs in which the ore is not allowed to generate. + #To blacklist all biomes from a single mod, use 'modid:*' + nether_biome_blacklist = [] + #Invert Blacklist to Whitelist [Default: false] + nether_biome_list_invert = false + + ["Iridium Config"."The End"] + #Activate/Deactivate the Ore Gen in The End [Default: false] + generate_in_the_end = false + #Baseline Y-Level [Default: 32] + #Range: 0 ~ 256 + end_base = 32 + #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 8] + #Range: 0 ~ 256 + end_spread = 8 + #Average Ores per Chunk [Default: 6] + #Range: 0 ~ 64 + end_count = 6 + #Ore Vein Size [Default: 6] + #Range: 0 ~ 64 + end_size = 6 + #List of biome IDs in which the ore is not allowed to generate. + #To blacklist all biomes from a single mod, use 'modid:*' + end_biome_blacklist = [] + #Invert Blacklist to Whitelist [Default: false] + end_biome_list_invert = false + diff --git a/config/ftbquests/quests/chapters/building.snbt b/config/ftbquests/quests/chapters/building.snbt index 3903c0cad1..24f0f476e8 100644 --- a/config/ftbquests/quests/chapters/building.snbt +++ b/config/ftbquests/quests/chapters/building.snbt @@ -702,7 +702,7 @@ y: 2.5d shape: "gear" subtitle: "The right tools for the job" - description: ["GENERAL_INTRO_DESC"] + description: [""] id: "5411C8D2344CC2F1" tasks: [{ id: "48834CDA218F71E0" diff --git a/config/ftbquests/quests/chapters/immersive_engineering.snbt b/config/ftbquests/quests/chapters/immersive_engineering.snbt index 691a77883f..33753f1e82 100644 --- a/config/ftbquests/quests/chapters/immersive_engineering.snbt +++ b/config/ftbquests/quests/chapters/immersive_engineering.snbt @@ -76,7 +76,7 @@ } { title: "Coke Oven" - icon: "immersiveengineering:cokebrick" + icon: "immersiveengineering:coke_oven" x: -3.5d y: -3.0d description: ["The Coke Oven is the first important multiblock in IE, made with a 3x3x3 cube of Coke Bricks. This structure can turn coal into coke and wood into charcoal; either operation produces creosote, an important byproduct used for Treated Wood."] @@ -168,6 +168,7 @@ } { title: "Blast Furnace" + icon: "immersiveengineering:blast_furnace" x: -3.5d y: -1.5d description: ["The Blast Furnace is used to process iron into steel, using coke or charcoal. This is a critically important structure... unless you get steel another way, anyway."] @@ -313,7 +314,7 @@ } { title: "Crusher" - icon: "immersiveengineering:light_engineering" + icon: "immersiveengineering:crusher" x: -5.5d y: -0.5d description: [ @@ -365,7 +366,7 @@ } { title: "Metal Press" - icon: "immersiveengineering:mold_plate" + icon: "immersiveengineering:metal_press" x: -1.5d y: -0.5d description: [ @@ -423,7 +424,7 @@ } { title: "Improved Blast Furnace" - icon: "immersiveengineering:blastbrick_reinforced" + icon: "immersiveengineering:advanced_blast_furnace" x: -5.5d y: -1.5d description: [ @@ -457,6 +458,7 @@ } { title: "Alloy Kiln" + icon: "immersiveengineering:alloy_smelter" x: 0.0d y: -3.0d description: ["The Alloy Kiln is a simple 2x2x2 structure that can smelt different types of metal together to form alloys."] @@ -478,7 +480,7 @@ } { title: "Arc Furnace" - icon: "immersiveengineering:storage_steel" + icon: "immersiveengineering:arc_furnace" x: -6.5d y: 0.0d description: [ @@ -621,13 +623,7 @@ } { title: "Sawmill" - icon: { - id: "immersiveengineering:sawblade" - Count: 1b - tag: { - Damage: 0 - } - } + icon: "immersiveengineering:sawmill" x: -1.5d y: 0.5d description: [ @@ -696,7 +692,7 @@ } { title: "Industrial Squeezer and Fermenter" - icon: "immersiveengineering:plantoil_bucket" + icon: "immersiveengineering:fermenter" x: -2.5d y: 0.5d description: [ @@ -791,7 +787,7 @@ } { title: "Diesel Generator" - icon: "immersiveengineering:biodiesel_bucket" + icon: "immersiveengineering:diesel_generator" x: -3.5d y: 2.5d description: [ @@ -853,7 +849,7 @@ } { title: "Excavator" - icon: "minecraft:gold_ore" + icon: "immersiveengineering:bucket_wheel" x: -6.5d y: 1.0d description: [ @@ -1017,7 +1013,7 @@ } { title: "Workbench Automation" - icon: "immersiveengineering:electron_tube" + icon: "immersiveengineering:auto_workbench" x: -8.5d y: -1.5d description: [ @@ -1075,7 +1071,7 @@ } { title: "Pumpjack" - icon: "immersivepetroleum:oil_bucket" + icon: "immersivepetroleum:pumpjack" x: -4.5d y: 0.5d description: [ @@ -1155,7 +1151,7 @@ } { title: "Distillation Tower" - icon: "immersivepetroleum:diesel_bucket" + icon: "immersivepetroleum:distillationtower" x: -4.5d y: 1.5d description: [ @@ -1220,7 +1216,7 @@ } { title: "Refinery" - icon: "immersiveengineering:biodiesel_bucket" + icon: "immersiveengineering:refinery" x: -2.5d y: 1.5d description: [ @@ -1307,7 +1303,7 @@ } { title: "Sulfur Recovery Unit" - icon: "immersivepetroleum:diesel_bucket" + icon: "immersivepetroleum:hydrotreater" x: -3.5d y: 1.0d description: [ diff --git a/config/ftbquests/quests/chapters/industrial_foregoing.snbt b/config/ftbquests/quests/chapters/industrial_foregoing.snbt index b9a5cbeb05..41aad450e4 100644 --- a/config/ftbquests/quests/chapters/industrial_foregoing.snbt +++ b/config/ftbquests/quests/chapters/industrial_foregoing.snbt @@ -32,11 +32,29 @@ description: ["The Fluid Extractor, shockingly, extracts fluid. Place one facing a log block, and it will slowly break down the log while producing Latex. Power is optional, but speeds up the process by a factor of 2.5. Acacia logs give the best yield."] dependencies: ["000000000000004D"] id: "000000000000004B" - tasks: [{ - id: "000000000000004C" - type: "item" - item: "industrialforegoing:fluid_extractor" - }] + tasks: [ + { + id: "000000000000004C" + type: "item" + title: "Fluid Extractor" + item: { + id: "itemfilters:or" + Count: 1b + tag: { + items: [ + { + id: "industrialforegoing:fluid_extractor" + Count: 1b + } + { + id: "thermal:device_tree_extractor" + Count: 1b + } + ] + } + } + } + ] rewards: [ { id: "0000000000000628" @@ -83,7 +101,23 @@ tasks: [{ id: "0000000000000050" type: "item" - item: "industrialforegoing:latex_processing_unit" + title: "Latex Processing Unit" + item: { + id: "itemfilters:or" + Count: 1b + tag: { + items: [ + { + id: "industrialforegoing:latex_processing_unit" + Count: 1b + } + { + id: "thermal:machine_refinery" + Count: 1b + } + ] + } + } }] rewards: [{ id: "0000000000000629" diff --git a/config/ftbquests/quests/chapters/occultism.snbt b/config/ftbquests/quests/chapters/occultism.snbt index b5db4ca5ed..2da5d86232 100644 --- a/config/ftbquests/quests/chapters/occultism.snbt +++ b/config/ftbquests/quests/chapters/occultism.snbt @@ -548,22 +548,14 @@ type: "item" item: "occultism:storage_controller" }] - rewards: [ - { - id: "0000000000000E6B" - type: "item" - title: "Tier 1 Dimensional Storage Stabilizer" - item: "occultism:storage_stabilizer_tier1" - } - { - id: "0000000000000E6C" - type: "command" - title: "Occultism Epic Loot Box" - icon: "kubejs:epic_lootbox" - command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:chests/quest_occultism_loot_epic" - player_command: false - } - ] + rewards: [{ + id: "0000000000000E6C" + type: "command" + title: "Occultism Epic Loot Box" + icon: "kubejs:epic_lootbox" + command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:chests/quest_occultism_loot_epic" + player_command: false + }] } { x: 5.0d @@ -591,7 +583,6 @@ type: "item" title: "Tier 1 Dimensional Storage Stabilizer" item: "occultism:storage_stabilizer_tier1" - count: 2 } { id: "0000000000000E5A" @@ -1024,7 +1015,7 @@ } { icon: "minecraft:ender_pearl" - x: 4.0d + x: 6.0d y: -1.0d shape: "hexagon" dependencies: ["0000000000000DC4"] @@ -1301,7 +1292,7 @@ { title: "Control the Weather!" icon: "minecraft:sunflower" - x: -1.0d + x: 0.5d y: 1.5d shape: "hexagon" description: [ @@ -1358,7 +1349,7 @@ } { icon: "minecraft:clock" - x: -1.0d + x: 0.5d y: 2.5d shape: "hexagon" subtitle: "What Time is It?!?!" @@ -1568,27 +1559,20 @@ ] dependencies: ["0000000000000CF7"] id: "0000000000000E04" - tasks: [ - { - id: "0000000000000E05" - type: "advancement" - title: "Summon Foliot Lumberjack" - icon: { - id: "occultism:book_of_calling_foliot_lumberjack" - Count: 1b - tag: { - spiritName: "Azurmiriarc" - } + tasks: [{ + id: "0000000000000E05" + type: "advancement" + title: "Summon Foliot Lumberjack" + icon: { + id: "occultism:book_of_calling_foliot_lumberjack" + Count: 1b + tag: { + spiritName: "Azurmiriarc" } - advancement: "occultism:occultism/summon_foliot_lumberjack" - criterion: "" } - { - id: "0000000000000E0D" - type: "item" - item: "occultism:book_of_binding_foliot" - } - ] + advancement: "occultism:occultism/summon_foliot_lumberjack" + criterion: "" + }] rewards: [{ id: "0000000000000E06" type: "command" @@ -1681,8 +1665,8 @@ { title: "Summon Drikwing Familiar" icon: "minecraft:feather" - x: 0.0d - y: -0.5d + x: 2.0d + y: 0.0d shape: "hexagon" description: [ "The occultist is also able to summon familiars to assist them on their journey." @@ -1907,7 +1891,7 @@ }] } { - x: -0.5d + x: 1.0d y: 0.5d shape: "hexagon" subtitle: "I wear my sun glasses at night! :catjam:" @@ -1963,10 +1947,11 @@ } { icon: "losttrinkets:octopus_leg" - x: 1.0d - y: -1.0d + x: 3.0d + y: 0.0d shape: "hexagon" subtitle: "Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn." + description: ["The Cthulu familiar provides the player with water breathing, and when upgraded by the blacksmith familiar he provides a mobile light source!"] dependencies: ["0000000000000D9E"] id: "37BA1FD75B5F474F" tasks: [{ @@ -1986,5 +1971,64 @@ player_command: false }] } + { + x: 4.0d + y: 0.0d + shape: "hexagon" + description: [ + "The Blacksmith familiar is one of the most useful familiars in the occultist's arsenal." + "" + "While following the player or in the familiar ring, he will eat up all the stones you mine and give a chance to repair your tools/armor!" + "" + "He is also able to upgrade many of your favorite familiars! Add some iron blocks or ingots to his anvil and he will go to work on familiars in the area." + ] + dependencies: ["0000000000000D9E"] + id: "5C7B9EA6F5861807" + tasks: [{ + id: "3AE8D0B894D9FAC1" + type: "advancement" + title: "Summon Blacksmith Familiar" + icon: "minecraft:anvil" + advancement: "occultism:occultism/familiar/blacksmith_upgrade" + criterion: "" + }] + rewards: [{ + id: "6DB0BF49C13038F7" + type: "command" + title: "Occultism Epic Loot Box Reward" + icon: "kubejs:epic_lootbox" + command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:chests/quest_occultism_loot_epic" + player_command: false + }] + } + { + icon: "occultism:ritual_dummy/custom_ritual" + x: 1.5d + y: -1.5d + description: [ + "These are just a few of the great familiars the occultist can summon." + "" + "Check the dictionary of spirits for many more helpful friends!" + ] + dependencies: [ + "0000000000000F3C" + "37BA1FD75B5F474F" + "5C7B9EA6F5861807" + "7FC9B2436C688AAC" + ] + dependency_requirement: "one_completed" + id: "6267BAB65DB567DA" + tasks: [{ + id: "6BEA5559EF14E691" + type: "checkmark" + title: "MOAR Familiars!" + }] + rewards: [{ + id: "751C76DF5C4D8BA3" + type: "item" + item: "occultism:book_of_binding_djinni" + count: 3 + }] + } ] } diff --git a/config/ftbquests/quests/chapters/resourceful_bees.snbt b/config/ftbquests/quests/chapters/resourceful_bees.snbt index 8e4f9d77ea..9bbba73685 100644 --- a/config/ftbquests/quests/chapters/resourceful_bees.snbt +++ b/config/ftbquests/quests/chapters/resourceful_bees.snbt @@ -955,7 +955,7 @@ description: [ "Progression in Resourceful Bees has changed as of E6 version 0.5.16." "" - "Tiered Beehives are no longer craftable, and are not part of Apiary recpes. Instead, the Bee Nests found via World Gen are used for initial Comb Generation, and both they and T4 Tiered Hive Upgrades are used in Apiary recipes." + "Tiered Beehives are no longer craftable, and are not part of Apiary recipes. Instead, the Bee Nests found via World Gen are used for initial Comb Generation, and both they and T4 Tiered Hive Upgrades are used in Apiary recipes." "" "To upgrade these nests you can use in-world Tiered Hive Upgrades. The quests now reflect this change." "" diff --git a/config/ftbquests/quests/chapters/tech_t3.snbt b/config/ftbquests/quests/chapters/tech_t3.snbt index 988ea06586..5e29e15ca8 100644 --- a/config/ftbquests/quests/chapters/tech_t3.snbt +++ b/config/ftbquests/quests/chapters/tech_t3.snbt @@ -100,7 +100,7 @@ { id: "5703696A09A152C1" type: "item" - item: "industrialforegoing:ore_laser_base" + item: "industrialforegoing:fluid_laser_base" } ] } @@ -109,7 +109,10 @@ x: -0.5d y: 2.5d subtitle: "Milk a Pink Wither." - dependencies: ["412F3A311A7CFCB3"] + dependencies: [ + "412F3A311A7CFCB3" + "0F16543E9DE08714" + ] id: "35EE2BA3A988F416" tasks: [{ id: "046A0A8AB86FF128" @@ -117,5 +120,88 @@ item: "industrialforegoing:pink_slime_bucket" }] } + { + x: 5.0d + y: 4.0d + dependencies: [ + "72945D9390F479E7" + "52FEE141AD87B819" + ] + id: "3B9B0EB73BF19CBD" + tasks: [{ + id: "65AF9984F551512B" + type: "item" + item: "mekanism:metallurgic_infuser" + }] + } + { + x: 4.5d + y: 1.5d + dependencies: ["1E4DC3A7546EC894"] + id: "20C024EA7A79FBB4" + tasks: [{ + id: "42D68FA716910115" + type: "item" + item: "rftoolspower:blazing_rod" + }] + } + { + x: 4.5d + y: 2.5d + dependencies: ["20C024EA7A79FBB4"] + id: "72945D9390F479E7" + tasks: [{ + id: "3C415238A247D89A" + type: "item" + item: "rftoolspower:blazing_agitator" + }] + } + { + x: 5.5d + y: 1.0d + dependencies: ["1E4DC3A7546EC894"] + id: "2182BC78D342D1AA" + tasks: [{ + id: "6B231E1F097FC1DC" + type: "item" + item: "rftoolscontrol:ram_chip" + }] + } + { + x: 5.5d + y: 2.0d + dependencies: ["2182BC78D342D1AA"] + id: "51AFB0E11AB83CFC" + tasks: [{ + id: "5DD654B9BD38AC93" + type: "item" + item: "kubejs:memory_basic_empty" + }] + } + { + x: 5.5d + y: 3.0d + description: ["High Technology requires smarter machines, and what better to make them more intelligent than one’s own distilled experience? "] + dependencies: ["51AFB0E11AB83CFC"] + id: "52FEE141AD87B819" + tasks: [{ + id: "7FDBBDEA3D78E027" + type: "item" + item: "kubejs:memory_basic_filled" + }] + } + { + x: -1.0d + y: 2.0d + shape: "diamond" + dependencies: ["6079CBE9ECE6EB1D"] + optional: true + id: "0F16543E9DE08714" + tasks: [{ + id: "6C1CEE8121C1BEA9" + type: "item" + item: "industrialforegoing:stasis_chamber" + }] + } ] } diff --git a/config/ftbquests/quests/chapters/tetra.snbt b/config/ftbquests/quests/chapters/tetra.snbt index 35a3adb62f..ac4bb28244 100644 --- a/config/ftbquests/quests/chapters/tetra.snbt +++ b/config/ftbquests/quests/chapters/tetra.snbt @@ -714,6 +714,8 @@ "Obsidian will get you to Tier 5." "" "If you need higher integrity, try out an End Rod as a handle." + "" + "Be warned, an End Rod handle may have… unfortunate side effects when near Endermen. Use with caution." ] dependencies: [ "0000000000000787" diff --git a/config/ftbquests/quests/chapters/tools.snbt b/config/ftbquests/quests/chapters/tools.snbt index 3d7c589fb1..eee27dbe5e 100644 --- a/config/ftbquests/quests/chapters/tools.snbt +++ b/config/ftbquests/quests/chapters/tools.snbt @@ -1128,10 +1128,35 @@ { id: "0000000000000460" type: "item" + title: "Mining Gadget" item: { - id: "mininggadgets:mininggadget" + id: "itemfilters:or" Count: 1b - tag: { } + tag: { + items: [ + { + id: "mininggadgets:mininggadget_simple" + Count: 1b + tag: { + energy: 1000000 + } + } + { + id: "mininggadgets:mininggadget_fancy" + Count: 1b + tag: { + energy: 1000000 + } + } + { + id: "mininggadgets:mininggadget" + Count: 1b + tag: { + energy: 1000000 + } + } + ] + } } } { diff --git a/config/ftbultimine.snbt b/config/ftbultimine.snbt index 8c8ae262b4..2abc1dd78c 100644 --- a/config/ftbultimine.snbt +++ b/config/ftbultimine.snbt @@ -1,3 +1,7 @@ +# Configuration for FTB Ultimine that is common to both Clients and Servers +# This file is used to control instance (e.g. modpack) specific things like mod integrations. +# Changes to this file require you to restart the game! + { # This is an advanced option, that you better leave alone This will stop ultimining on first block that it can't mine, rather than skipping it. # Default: false diff --git a/config/immersiveengineering-common.toml b/config/immersiveengineering-common.toml index 9665329a10..099b6c4593 100644 --- a/config/immersiveengineering-common.toml +++ b/config/immersiveengineering-common.toml @@ -1,6 +1,6 @@ #A list of preferred Mod IDs that results of IE processes should stem from, aka which mod you want the copper to come from. #This affects the ores dug by the excavator, as well as those crushing recipes that don't have associated IE items. This list is in oreder of priority. -preferredOres = ["emendatusenigmatica", "minecraft", "immersiveengineering", "thermal", "create", "mekanism", "jaopca", "kubejs", "appliedenergistics2", "pneumaticcraft", "occultism", "tmechworks", "industrialforegoing", "botania", "quark", "pedestals"] +preferredOres = ["emendatusenigmatica", "minecraft", "thermal", "immersiveengineering", "create", "mekanism", "jaopca", "kubejs", "appliedenergistics2", "pneumaticcraft", "occultism", "tmechworks", "industrialforegoing", "botania", "quark", "pedestals"] #IMPORTANT NOTICE: #THIS IS ONLY THE COMMON CONFIG. It does not contain all the values adjustable for IE. #All modifiers for machines, all ore gen, the retrogen features and most other adjustable values have been moved to immersiveengineering-server.toml. diff --git a/config/logprot-common.toml b/config/logprot-common.toml index 8698ca8266..6acfcb326b 100644 --- a/config/logprot-common.toml +++ b/config/logprot-common.toml @@ -1,9 +1,9 @@ [Login-settings] - #Time in ticks the logging player is invulnerable, 20 ticks = 1sec. Default is 5secs = 100 ticks + #Time in ticks the logging player is invulnerable, 20 ticks = 1sec. Default is 50secs = 1000 ticks #Range: 0 ~ 50000 invulnerabilityTime = 2400 - #Max distance in blocks(2d) the invulnerability lasts, default: 4 + #Max distance in blocks(2d) the invulnerability lasts, default: 10 #Range: 1 ~ 200 maxDistance = 2 diff --git a/config/morphtool-common.toml b/config/morphtool-common.toml index 10d445c95e..bf7391c7ac 100644 --- a/config/morphtool-common.toml +++ b/config/morphtool-common.toml @@ -3,5 +3,5 @@ "Whitelisted Items" = ["compactmachines:personal_shrinking_device", "botania:twig_wand", "immersiveengineering:tool", "bloodmagic:ritual_reader", "bloodmagic:ritualtinkerer", "astralsorcery:wand", "transport:rail_breaker", "storagedrawers:drawer_key", "resourcefulbees_scraper", "ars_nouveau:dominion_wand"] "Whitelisted Names" = ["wrench", "screwdriver", "hammer", "rotator", "configurator", "crowbar"] "Blacklisted Mods" = [] -"Mod Aliases" = ["mythicbotany=botania", "rsrequestify=refinedstorage", "framedcompactdrawers=storagedrawers", "extrastorage=refinedstorage", "thermalexpansion=thermalfoundation", "thermaldynamics=thermalfoundation", "thermalcultivation=thermalfoundation", "integrateddynamics=integratedtunnels", "mekanismgenerators=mekanism", "mekanismtools=mekanism", "xnet=rftoolsbase", "rftoolspower=rftoolsbase", "rftoolsutility=rftoolsbase", "rftoolsstorage=rftoolsbase", "rftoolscontrol=rftoolsbase", "rftoolsbuilder=rftoolsbase", "rftoolsdimensions=rftoolsbase"] +"Mod Aliases" = ["mythicbotany=botania", "rsrequestify=refinedstorage", "framedcompactdrawers=storagedrawers", "extrastorage=refinedstorage", "thermalexpansion=thermalfoundation", "thermaldynamics=thermalfoundation", "thermalcultivation=thermalfoundation", "integrateddynamics=integratedtunnels", "mekanismgenerators=mekanism", "mekanismtools=mekanism", "xnet=rftoolsbase", "rftoolspower=rftoolsbase", "rftoolsutility=rftoolsbase", "rftoolsstorage=rftoolsbase", "rftoolscontrol=rftoolsbase", "rftoolsbuilder=rftoolsbase", "rftoolsdimensions=rftoolsbase", "ppfluids=prettypipes"] diff --git a/config/powah/energy/energizing.toml b/config/powah/energy/energizing.toml index 991e1eb3be..0b5cc857d8 100644 --- a/config/powah/energy/energizing.toml +++ b/config/powah/energy/energizing.toml @@ -4,33 +4,33 @@ range = 4 [Energy_Capacity] #Range: 0 ~ 9000000000000000000 - spiritedCap = 4000000 - #Range: 0 ~ 9000000000000000000 - blazingCap = 800000 + starterCap = 10000 #Range: 0 ~ 9000000000000000000 basicCap = 100000 #Range: 0 ~ 9000000000000000000 - nioticCap = 1500000 + hardenedCap = 250000 #Range: 0 ~ 9000000000000000000 - nitroCap = 10000000 + blazingCap = 800000 #Range: 0 ~ 9000000000000000000 - hardenedCap = 250000 + nioticCap = 1500000 #Range: 0 ~ 9000000000000000000 - starterCap = 10000 + spiritedCap = 4000000 + #Range: 0 ~ 9000000000000000000 + nitroCap = 10000000 [Energy_Transfer] - #Range: 0 ~ 9000000000000000000 - spiritedTransfer = 1200 #Range: 0 ~ 9000000000000000000 starterTransfer = 10 #Range: 0 ~ 9000000000000000000 basicTransfer = 50 #Range: 0 ~ 9000000000000000000 - hardenedTransfer = 120 + hardenedTransfer = 135 + #Range: 0 ~ 9000000000000000000 + blazingTransfer = 450 #Range: 0 ~ 9000000000000000000 - nioticTransfer = 700 + nioticTransfer = 2100 #Range: 0 ~ 9000000000000000000 - blazingTransfer = 300 + spiritedTransfer = 14000 #Range: 0 ~ 9000000000000000000 - nitroTransfer = 3000 + nitroTransfer = 154000 diff --git a/config/repurposed_structures-forge/dungeons.toml b/config/repurposed_structures-forge/dungeons.toml index 26ace924d2..770a77d327 100644 --- a/config/repurposed_structures-forge/dungeons.toml +++ b/config/repurposed_structures-forge/dungeons.toml @@ -1,3 +1,7 @@ +# +# Whether End Dungeons spawns Shulker Boxes. if false, spawns regular Chests instead. +#(Configuredfeatures are unable to be overridden by datapack due to bad Forge hook placement. Hence this config option) +shulkerBoxInEndDungeons = true [AttemptsPerChunk] # diff --git a/config/resourcefulbees/bees/material/Clay.json b/config/resourcefulbees/bees/material/Clay.json index b33bef6d49..259c306c66 100644 --- a/config/resourcefulbees/bees/material/Clay.json +++ b/config/resourcefulbees/bees/material/Clay.json @@ -1,6 +1,6 @@ { "flower": "ALL", - "lore": "Tier 2:\nThe temperment of the Rocky Bee can be\nsoftened by the Slimy Bee, yeilding Clay.", + "lore": "Tier 2:\nThe temperment of the Rocky Bee can be\nsoftened by the Slimy Bee, yielding Clay.", "loreColor": "#00AAAA", "maxTimeInHive": 2400, "sizeModifier": 0.75, @@ -21,14 +21,12 @@ "attackDamage": 1 }, "MutationData": { - "mutations" : [ - { - "type": "BLOCK", - "inputID": "tag:minecraft:sand", - "outputs": [ - {"outputID": "minecraft:clay", "weight": 10} - ] - } + "mutations": [ + { + "type": "BLOCK", + "inputID": "tag:minecraft:sand", + "outputs": [{ "outputID": "minecraft:clay", "weight": 10 }] + } ] }, "CentrifugeData": { diff --git a/config/sophisticatedbackpacks-common.toml b/config/sophisticatedbackpacks-common.toml index 6e5f06c9e4..b1e4c1dff1 100644 --- a/config/sophisticatedbackpacks-common.toml +++ b/config/sophisticatedbackpacks-common.toml @@ -2,7 +2,7 @@ #Common Settings [common] #Disable / enable any items here (disables their recipes) - enabledItems = ["void_upgrade:true", "compacting_upgrade:true", "advanced_restock_upgrade:true", "diamond_backpack:true", "smelting_upgrade:true", "filter_upgrade:true", "magnet_upgrade:true", "advanced_magnet_upgrade:true", "deposit_upgrade:true", "iron_backpack:true", "stonecutter_upgrade:true", "backpack:true", "feeding_upgrade:true", "advanced_pickup_upgrade:true", "jukebox_upgrade:true", "everlasting_upgrade:true", "advanced_filter_upgrade:true", "inception_upgrade:true", "crafting_upgrade:true", "auto_smelting_upgrade:true", "pickup_upgrade:true", "stack_upgrade_tier_4:true", "stack_upgrade_tier_2:true", "stack_upgrade_tier_3:true", "stack_upgrade_tier_1:true", "upgrade_base:true", "refill_upgrade:true", "advanced_compacting_upgrade:true", "gold_backpack:true", "advanced_deposit_upgrade:true", "advanced_void_upgrade:true", "restock_upgrade:true", "advanced_tool_swapper_upgrade:true", "tool_swapper_upgrade:true", "netherite_backpack:true", "tank_upgrade:true", "advanced_feeding_upgrade:true", "battery_upgrade:true"] + enabledItems = ["void_upgrade:true", "compacting_upgrade:true", "advanced_restock_upgrade:true", "diamond_backpack:true", "smelting_upgrade:true", "filter_upgrade:true", "magnet_upgrade:true", "advanced_magnet_upgrade:true", "deposit_upgrade:true", "iron_backpack:true", "stonecutter_upgrade:true", "backpack:true", "feeding_upgrade:true", "advanced_pickup_upgrade:true", "jukebox_upgrade:true", "everlasting_upgrade:true", "advanced_filter_upgrade:true", "inception_upgrade:true", "crafting_upgrade:true", "auto_smelting_upgrade:true", "pickup_upgrade:true", "stack_upgrade_tier_4:true", "stack_upgrade_tier_2:true", "stack_upgrade_tier_3:true", "stack_upgrade_tier_1:true", "upgrade_base:true", "refill_upgrade:true", "advanced_compacting_upgrade:true", "gold_backpack:true", "advanced_deposit_upgrade:true", "advanced_void_upgrade:true", "restock_upgrade:true", "advanced_tool_swapper_upgrade:true", "tool_swapper_upgrade:true", "netherite_backpack:true", "tank_upgrade:true", "advanced_feeding_upgrade:true", "battery_upgrade:true", "advanced_pump_upgrade:true", "pump_upgrade:true", "xp_pump_upgrade:true"] #Turns on/off loot added to various vanilla chest loot tables chestLootEnabled = true @@ -296,3 +296,15 @@ #List of items that are not supposed to stack in backpack even when stack upgrade is inserted. Item registry names are expected here. nonStackableItems = [] + #Pump Upgrade Settings + [common.pumpUpgrade] + #Number of fluid filter slots + #Range: 1 ~ 20 + filterSlots = 4 + #How much mB can be transfered in / out per operation. This is a base transfer rate that gets multiplied by number of rows in backpack and stack multiplier. + #Range: 1 ~ 1000 + maxInputOutput = 20 + #Ratio that gets applied (multiplies) to inventory stack multiplier before this is applied to max input/output value. Value lower than 1 makes stack multiplier affect the capacity less, higher makes it affect the capacity more. 0 turns off stack multiplier affecting input/output + #Range: 0.0 ~ 5.0 + stackMultiplierRatio = 1.0 + diff --git a/config/supplementaries-common.toml b/config/supplementaries-common.toml index 24b9f9f346..52c5382993 100644 --- a/config/supplementaries-common.toml +++ b/config/supplementaries-common.toml @@ -3,9 +3,6 @@ [blocks] [blocks.globe] - #chanche of finding a globe in a shipwreck treasure chest. - #Range: 0.0 ~ 1.0 - shipwreck_treasure_chance = 0.25 #how many globe trades to give to the wandering trader. This will effectively increase the chance of him having a globe trader. Increase this if you have other mods that add stuff to that trader #Range: 0 ~ 50 chance = 2 diff --git a/defaultconfigs/astralsorcery.toml b/defaultconfigs/astralsorcery.toml index 271098b377..9fc14872cd 100644 --- a/defaultconfigs/astralsorcery.toml +++ b/defaultconfigs/astralsorcery.toml @@ -8,7 +8,7 @@ #If set to 'true' anything that prevents mobspawning !by this mod!, will also prevent EVERY natural mobspawning of any mobtype. When set to 'false' it'll only stop monsters of type 'MONSTER' from spawning. mobSpawningDenyAllTypes = false #Features generating random ores in AstralSorcery will not spawn ores from mods listed here. - modidOreBlacklist = ["create", "eidolon", "occultism", "techreborn", "gregtech","mekanism","thermal","undergarden","immersiveengineering","tmechworks","mapperbase","minecraft","tconstruct"] + modidOreBlacklist = ["create", "eidolon", "occultism", "techreborn", "gregtech","mekanism","thermal","undergarden","immersiveengineering","tmechworks","mapperbase","minecraft","tconstruct","byg"] #Set this to false to prevent players from being affected by entity-related colored lens effects. doColoredLensesAffectPlayers = true @@ -16,14 +16,6 @@ #Sets the amount of damage reduction a player gets when being hit by a DE chaos-damage-related damagetype. #Range: 0.0 ~ 1.0 capeChaosResistance = 0.8 - #If this is set to true, charged crystals tools can revert back to their inert state. - chargedToolsRevert = true - #Defines the minimum uses a user at least gets before it's trying to revert to an inert crystal tool. - #Range: 0 ~ 2147483646 - chargedToolsRevertStart = 40 - #After 'chargedCrystalToolsRevertStart' uses, it will random.nextInt(chance) == 0 try and see if the tool gets reverted to its inert crystal tool. - #Range: 1 ~ 1073741823 - chargedToolsRevertChance = 80 [tools.wands] #Sets the quick-charge cost for one usage of the illumination wand @@ -90,17 +82,17 @@ [perks.root] - [perks.root.armara] + [perks.root.vicio] #Defines the general exp multiplier for this root perk. Can be used for balancing in a pack environment. #Range: 0.10000000149011612 ~ 20.0 expMultiplier = 1.0 - [perks.root.aevitas] + [perks.root.armara] #Defines the general exp multiplier for this root perk. Can be used for balancing in a pack environment. #Range: 0.10000000149011612 ~ 20.0 expMultiplier = 1.0 - [perks.root.vicio] + [perks.root.evorsio] #Defines the general exp multiplier for this root perk. Can be used for balancing in a pack environment. #Range: 0.10000000149011612 ~ 20.0 expMultiplier = 1.0 @@ -110,49 +102,57 @@ #Range: 0.10000000149011612 ~ 20.0 expMultiplier = 1.0 - [perks.root.evorsio] + [perks.root.aevitas] #Defines the general exp multiplier for this root perk. Can be used for balancing in a pack environment. #Range: 0.10000000149011612 ~ 20.0 expMultiplier = 1.0 [perks.key] - [perks.key.proj_proximity] - #Defines the distance at which no additional damage is awarded. - #Range: 4.0 ~ 65536.0 - capDistance = 100.0 - #Defines the maximum multiplier that can be reached if the distance when hitting something with projectiles is basically nothing. + [perks.key.no_armor] + #The multiplier that is applied to damage the player receives. The lower the more damage is negated. + #Range: 0.10000000149011612 ~ 1.0 + damageTakenMultiplier = 0.699999988079071 + + [perks.key.culling] + #Defines the percentage at how low the entities' health as to be to then cull the entity. + #Range: 0.05000000074505806 ~ 0.5 + cullHealth = 0.15000000596046448 + #Defines the amount of starlight charge consumed per culling attempt. + #Range: 1 ~ 500 + chargeCost = 250 + + [perks.key.proj_distance] + #Defines the distance that must be reached to achieve the maximum damage multiplier + #Range: 100.0 ~ 65536.0 + capDistance = 6400.0 + #Defines the maximum multiplier that can be reached if the 'capDistance' is reached or surpassed when hitting something #Range: 0.05000000074505806 ~ 5.0 maxAdditionalMultiplier = 0.75 - [perks.key.mending] - #Sets the chance (Random.nextInt(chance) == 0) to try to see if a piece of armor on the player that is damageable and damaged can be repaired; the lower the more likely. - #Range: > 5 - chanceToRepair = 800 - #Defines the amount of starlight charge consumed per restored durability point. - #Range: 1 ~ 500 - chargeCost = 60 + [perks.key.damage_effects] + #Defines the chance per hit to apply additional effects. + #Range: 0.009999999776482582 ~ 0.20000000298023224 + applicationChance = 0.07999999821186066 - [perks.key.lightning_arc] - #Sets the chance to spawn a damage-arc effect when an enemy is hit (value is in percent). - #Range: 0.1 ~ 1.0 - arcChance = 0.6000000238418579 - #Defines the damage-multiplier which gets added to the damage dealt initially. - #Range: 0.1 ~ 8.0 - arcPercent = 0.6000000238418579 - #Defines the distance for how far a single arc can jump/search for nearby entities. - #Range: 0.2 ~ 16.0 - arcDistance = 7.0 - #Range: 1 ~ 32 - arcTicks = 3 - #Defines the amount of starlight charge consumed per spawned lighning arc. + [perks.key.growable] + #Sets the chance to try to see if a random plant near the player gets bonemeal'd. + #Range: 0.0 ~ 1.0 + chanceToBonemeal = 0.30000001192092896 + #Defines the radius around which the perk effect should apply around the player. + #Range: 1 ~ 16 + radius = 3 + #Defines the amount of starlight charge consumed per growth-attempt. #Range: 1 ~ 500 - chargeCost = 60 + chargeCost = 120 - [perks.key.disarm] - #Defines the chance (in percent) per hit to make the attacked entity drop its armor. - #Range: 0.0 ~ 1.0 - dropChance = 0.05000000074505806 + [perks.key.rampage] + #Defines the chance to gain rampage buffs when killing a mob + #Range: 0.05000000074505806 ~ 1.0 + rampageChance = 1.0 + #Defines the duration of the rampage in ticks + #Range: 10 ~ 100000 + rampageDuration = 100 [perks.key.cheat_death] #Once the potion effect gets applied, it'll take at least this amount of ticks or a server restart until it can be re-applied by this perk. @@ -168,6 +168,14 @@ #Range: 1 ~ 500 chargeCost = 350 + [perks.key.mending] + #Sets the chance (Random.nextInt(chance) == 0) to try to see if a piece of armor on the player that is damageable and damaged can be repaired; the lower the more likely. + #Range: > 5 + chanceToRepair = 800 + #Defines the amount of starlight charge consumed per restored durability point. + #Range: 1 ~ 500 + chargeCost = 60 + [perks.key.stone_enrichment] #Defines the radius where a random position to generate a ore at is checked for #Range: 1 ~ 15 @@ -179,25 +187,6 @@ #Range: 1 ~ 500 chargeCost = 150 - [perks.key.spawn_lights] - #Defines the rate in ticks a position to spawn a light in is attempted to be found near the player - #Range: 4 ~ 1000 - lightSpawnRate = 15 - #Defines the radius around the player the perk will search for a suitable position - #Range: 2 ~ 10 - lightSpawnRadius = 5 - #Defines the amount of starlight charge consumed per spawned light. - #Range: 1 ~ 500 - chargeCost = 60 - - [perks.key.rampage] - #Defines the chance to gain rampage buffs when killing a mob - #Range: 0.05000000074505806 ~ 1.0 - rampageChance = 1.0 - #Defines the duration of the rampage in ticks - #Range: 10 ~ 100000 - rampageDuration = 100 - [perks.key.bleed] #Defines the duration of the bleeding effect when applied. Refreshes this duration when a it is applied again #Range: 5 ~ 400 @@ -206,44 +195,34 @@ #Range: 0.01 ~ 1.0 bleedChance = 0.25 - [perks.key.culling] - #Defines the percentage at how low the entities' health as to be to then cull the entity. - #Range: 0.05000000074505806 ~ 0.5 - cullHealth = 0.15000000596046448 - #Defines the amount of starlight charge consumed per culling attempt. - #Range: 1 ~ 500 - chargeCost = 250 - - [perks.key.growable] - #Sets the chance to try to see if a random plant near the player gets bonemeal'd. - #Range: 0.0 ~ 1.0 - chanceToBonemeal = 0.30000001192092896 - #Defines the radius around which the perk effect should apply around the player. - #Range: 1 ~ 16 - radius = 3 - #Defines the amount of starlight charge consumed per growth-attempt. + [perks.key.lightning_arc] + #Sets the chance to spawn a damage-arc effect when an enemy is hit (value is in percent). + #Range: 0.1 ~ 1.0 + arcChance = 0.6000000238418579 + #Defines the damage-multiplier which gets added to the damage dealt initially. + #Range: 0.1 ~ 8.0 + arcPercent = 0.6000000238418579 + #Defines the distance for how far a single arc can jump/search for nearby entities. + #Range: 0.2 ~ 16.0 + arcDistance = 7.0 + #Range: 1 ~ 32 + arcTicks = 3 + #Defines the amount of starlight charge consumed per spawned lighning arc. #Range: 1 ~ 500 - chargeCost = 120 - - [perks.key.void_trash] - #List items that should count as trash and should be voided. - trashItems = ["minecraft:dirt", "minecraft:cobblestone", "minecraft:andesite", "minecraft:diorite", "minecraft:granite", "minecraft:stone", "minecraft:gravel"] - #Chance that a voided drop will instead yield a random ore out of the configured ore table. - #Range: 0.0 ~ 1.0 - oreChance = 0.019999999552965164 + chargeCost = 60 - [perks.key.proj_distance] - #Defines the distance that must be reached to achieve the maximum damage multiplier - #Range: 100.0 ~ 65536.0 - capDistance = 6400.0 - #Defines the maximum multiplier that can be reached if the 'capDistance' is reached or surpassed when hitting something + [perks.key.proj_proximity] + #Defines the distance at which no additional damage is awarded. + #Range: 4.0 ~ 65536.0 + capDistance = 100.0 + #Defines the maximum multiplier that can be reached if the distance when hitting something with projectiles is basically nothing. #Range: 0.05000000074505806 ~ 5.0 maxAdditionalMultiplier = 0.75 - [perks.key.damage_effects] - #Defines the chance per hit to apply additional effects. - #Range: 0.009999999776482582 ~ 0.20000000298023224 - applicationChance = 0.07999999821186066 + [perks.key.disarm] + #Defines the chance (in percent) per hit to make the attacked entity drop its armor. + #Range: 0.0 ~ 1.0 + dropChance = 0.05000000074505806 [perks.key.last_breath] #Defines the dig speed multiplier you get additionally to your normal dig speed when being low on health (25% health = 75% of this additional multiplier) @@ -253,28 +232,41 @@ #Range: 0.1 ~ 10.0 damageMultiplier = 3.0 - [perks.key.no_armor] - #The multiplier that is applied to damage the player receives. The lower the more damage is negated. - #Range: 0.10000000149011612 ~ 1.0 - damageTakenMultiplier = 0.699999988079071 + [perks.key.void_trash] + #List items that should count as trash and should be voided. + trashItems = ["minecraft:dirt", "minecraft:cobblestone", "minecraft:andesite", "minecraft:diorite", "minecraft:granite", "minecraft:stone", "minecraft:gravel"] + #Chance that a voided drop will instead yield a random ore out of the configured ore table. + #Range: 0.0 ~ 1.0 + oreChance = 0.019999999552965164 [perks.key.damage_armor] #Defines how much damage is dealt additionally to armor. This value gets multiplied by the amount of armorpieces the entity you're attacking wears. #Range: 0.009999999776482582 ~ 0.20000000298023224 damagePerArmor = 0.05000000074505806 - [perks.type] - - [perks.type.miningsize] - #Defines the amount of starlight charge consumed per additional block break through this attribute. + [perks.key.spawn_lights] + #Defines the rate in ticks a position to spawn a light in is attempted to be found near the player + #Range: 4 ~ 1000 + lightSpawnRate = 15 + #Defines the radius around the player the perk will search for a suitable position + #Range: 2 ~ 10 + lightSpawnRadius = 5 + #Defines the amount of starlight charge consumed per spawned light. #Range: 1 ~ 500 - chargeCost = 4 + chargeCost = 60 + + [perks.type] [perks.type.dodge] #Defines the amount of starlight charge consumed per dodged damage. #Range: 1 ~ 500 chargeCost = 80 + [perks.type.miningsize] + #Defines the amount of starlight charge consumed per additional block break through this attribute. + #Range: 1 ~ 500 + chargeCostPerBreak = 2 + [enchantment_amulet] #Defines the chance to roll a 2nd-enchantment-manipulating roll on the amulet. Value defines a percent chance from 0% to 100%. Setting this to 0 also prevents a 3rd roll #Range: 0.0 ~ 1.0 @@ -450,12 +442,12 @@ #Range: 1 ~ 2048 maxAmount = 5 #Defines the maximum default tick-time until a fish may be fished by the ritual. Gets reduced internally the more starlight was provided at the ritual. Has to be bigger as the minimum time; if it isn't it'll be set to the minimum. - #Range: > 20 + #Range: > 10 maxFishTickTime = 500 #Defines the minimum default tick-time until a fish may be fished by the ritual. Gets reduced internally the more starlight was provided at the ritual. #Range: > 20 + minFishTickTime = 100 - [constellation.effect.pelotrio] #Set this to false to disable this ritual effect enabled = true @@ -502,9 +494,9 @@ #Set the amount of food recovered by food cycle. #Range: 0.0 ~ 100.0 foodPerCycle = 1.0 - #Set the amount alignment charge consumed per block placed - #Range: 0 ~ 1000 - chargeCostPerBlock = 2 + #Set the amount alignment charge consumed per tick when walking/standing in the air + #Range: 0.0 ~ 100.0 + chargeCostPerTravelTick = 2 #Set the amount alignment charge consumed per feed-cycle #Range: 0 ~ 1000 chargeCostPerFood = 100 @@ -683,7 +675,7 @@ [registries.tile_acceleration_blacklist] #Accepts & matches against strings: 1) what a tileentity-type's registry name starts with, 2) what a tileentity's fully qualified class name starts with, 3) (special case) a fully qualified class name (Instances & sub-class instance of that class will be blacklisted) - tile_acceleration_blacklist = ["appeng", "raoulvdberge.refinedstorage", "hellfirepvp.astralsorcery.common.tile.base.network.TileTransmissionBase", "hellfirepvp.astralsorcery.common.tile.base.network.TileSourceBase", "hellfirepvp.astralsorcery.common.tile.altar.TileAltar", "hellfirepvp.astralsorcery.common.tile.TileAttunementAltar", "hellfirepvp.astralsorcery.common.tile.TileObservatory", "hellfirepvp.astralsorcery.common.tile.TileRitualLink", "hellfirepvp.astralsorcery.common.tile.TileRitualPedestal", "hellfirepvp.astralsorcery.common.tile.TileTranslucentBlock", "hellfirepvp.astralsorcery.common.tile.TileTreeBeaconComponent", "hellfirepvp.astralsorcery.common.tile.TileVanishing"] + tile_acceleration_blacklist = ["net.minecraft.tileentity.PistonTileEntity", "net.minecraft.tileentity.LockableLootTileEntity", "appeng", "raoulvdberge.refinedstorage", "hellfirepvp.astralsorcery.common.tile.base.network.TileTransmissionBase", "hellfirepvp.astralsorcery.common.tile.base.network.TileSourceBase", "hellfirepvp.astralsorcery.common.tile.altar.TileAltar", "hellfirepvp.astralsorcery.common.tile.TileAttunementAltar", "hellfirepvp.astralsorcery.common.tile.TileObservatory", "hellfirepvp.astralsorcery.common.tile.TileRitualLink", "hellfirepvp.astralsorcery.common.tile.TileRitualPedestal", "hellfirepvp.astralsorcery.common.tile.TileSpectralRelay", "hellfirepvp.astralsorcery.common.tile.TileTelescope", "hellfirepvp.astralsorcery.common.tile.TileTranslucentBlock", "hellfirepvp.astralsorcery.common.tile.TileTreeBeaconComponent", "hellfirepvp.astralsorcery.common.tile.TileVanishing"] [registries.amulet_enchantments] #Defines a whitelist of which enchantments can be rolled and buffed by the enchantment-amulet. The higher the weight, the more likely that roll is selected.Format: ; @@ -696,7 +688,6 @@ [registries.perk_void_trash_ore] #Format: ';' Defines random-weighted ore-selection data. Define item-tags to select from here with associated weight. Specific mods can be blacklisted in the general AstralSorcery config in 'modidOreBlacklist'. perk_void_trash_ore = ["forge:ores/aluminum;1200","forge:ores/apatite;700","forge:ores/mana;200", "forge:ores/bitumen;1000","forge:ores/cinnabar;500","forge:ores/coal;5200","forge:ores/copper;2000","forge:ores/diamond;120","forge:ores/dimensional;20","forge:ores/emerald;100","forge:ores/fluorite;50","forge:ores/gold;550","forge:ores/iron;2500","forge:ores/lapis;360","forge:ores/lead;1500","forge:ores/nickel;100","forge:ores/osmium;1500","forge:ores/potassium_nitrate;250","forge:ores/redstone;700","forge:ores/silver;1000","forge:ores/sulfur;300","forge:ores/tin;1800","forge:ores/uranium;400","forge:ores/zinc;1000"] - [registries.perk_stone_enrichment_ore] #Format: ';' Defines random-weighted ore-selection data. Define block-tags to select from here with associated weight. Specific mods can be blacklisted in the general AstralSorcery config in 'modidOreBlacklist'. perk_stone_enrichment_ore = ["forge:ores/aluminum;1200","forge:ores/apatite;700","forge:ores/mana;200", "forge:ores/bitumen;1000","forge:ores/cinnabar;500","forge:ores/coal;5200","forge:ores/copper;2000","forge:ores/diamond;120","forge:ores/dimensional;20","forge:ores/emerald;100","forge:ores/fluorite;50","forge:ores/gold;550","forge:ores/iron;2500","forge:ores/lapis;360","forge:ores/lead;1500","forge:ores/nickel;100","forge:ores/osmium;1500","forge:ores/potassium_nitrate;250","forge:ores/redstone;700","forge:ores/silver;1000","forge:ores/sulfur;300","forge:ores/tin;1800","forge:ores/uranium;400","forge:ores/zinc;1000"] @@ -704,7 +695,6 @@ [registries.mineralis_ritual_ore] #Format: ';' Defines random-weighted ore-selection data. Define block-tags to select from here with associated weight. Specific mods can be blacklisted in the general AstralSorcery config in 'modidOreBlacklist'. mineralis_ritual_ore = ["forge:ores/aluminum;1200","forge:ores/apatite;700","forge:ores/mana;200", "forge:ores/bitumen;1000","forge:ores/cinnabar;500","forge:ores/coal;2400","forge:ores/copper;2000","forge:ores/diamond;120","forge:ores/dimensional;20","forge:ores/emerald;100","forge:ores/fluorite;50","forge:ores/gold;550","forge:ores/iron;2500","forge:ores/lapis;360","forge:ores/lead;1500","forge:ores/nickel;100","forge:ores/osmium;1500","forge:ores/potassium_nitrate;250","forge:ores/redstone;700","forge:ores/silver;1000","forge:ores/sulfur;300","forge:ores/tin;1800","forge:ores/uranium;400","forge:ores/zinc;1000"] - [registries.entity_transmutation] #Defines the entity types the corrupted pelotrio ritual can transmute from and to. Format: ; entity_transmutation = ["minecraft:skeleton;minecraft:wither_skeleton", "minecraft:villager;minecraft:witch", "minecraft:pig;minecraft:zombified_piglin", "minecraft:cow;minecraft:zombie", "minecraft:parrot;minecraft:ghast", "minecraft:chicken;minecraft:blaze", "minecraft:sheep;minecraft:stray", "minecraft:horse;minecraft:skeleton_horse"] diff --git a/defaultconfigs/ftbessentials-server.snbt b/defaultconfigs/ftbessentials-server.snbt new file mode 100644 index 0000000000..179776f94c --- /dev/null +++ b/defaultconfigs/ftbessentials-server.snbt @@ -0,0 +1,13 @@ +# Default config file that will be copied to world's serverconfig/ftbessentials.snbt location +# Copy values you wish to override in here +# Example: +# +# { +# misc: { +# enderchest: { +# enabled: false +# } +# } +# } + +{ } diff --git a/defaultconfigs/immersivepetroleum-server.toml b/defaultconfigs/immersivepetroleum-server.toml index 327bdc82a0..8815752714 100644 --- a/defaultconfigs/immersivepetroleum-server.toml +++ b/defaultconfigs/immersivepetroleum-server.toml @@ -16,14 +16,22 @@ distillationTower_energyModifier = 1.0 #A modifier to apply to the time of every Distillation recipe. Can't be lower than 1, default=1 distillationTower_timeModifier = 1.0 + #A modifier to apply to the energy costs of every Coker Tower recipe, default=1 + cokerUnit_energyModifier = 1.0 + #A modifier to apply to the time of every Coker recipe. Can't be lower than 1, default=1 + cokerUnit_timeModifier = 1.0 + #A modifier to apply to the energy costs of every Sulfur Recovery Unit recipe, default=1 + hydrotreater_energyModifier = 1.0 + #A modifier to apply to the time of every Sulfur Recovery Unit recipe. Can't be lower than 1, default=1 + hydrotreater_timeModifier = 1.0 [Generation] #List of Portable Generator fuels. Format: fluid_name, mb_used_per_tick, flux_produced_per_tick - fuels = ["immersivepetroleum:gasoline, 5, 256"] + fuels = ["immersivepetroleum:gasoline, 5, 256", "pneumaticcraft:gasoline, 5, 256", "thermal:refined_fuel, 5, 256"] [Miscellaneous] #List of Motorboat fuels. Format: fluid_name, mb_used_per_tick - boat_fuels = ["immersivepetroleum:gasoline, 1"] + boat_fuels = ["immersivepetroleum:gasoline, 1", "pneumaticcraft:gasoline, 1", "thermal:refined_fuel, 1"] #Automatically unlock IP recipes for new players, default=true autounlock_recipes = true #Set to false to disable the asphalt block boosting player speed, default=true diff --git a/defaultconfigs/solcarrot-server.toml b/defaultconfigs/solcarrot-server.toml index d3737bbf45..bffb21d1d7 100644 --- a/defaultconfigs/solcarrot-server.toml +++ b/defaultconfigs/solcarrot-server.toml @@ -14,7 +14,7 @@ #Range: 0 ~ 1000 minimumFoodValue = 1 #Foods in this list won't affect the player's health nor show up in the food book. - blacklist = ["farmersdelight:fried_egg"] + blacklist = ["farmersdelight:fried_egg", "environmental:cherry_pie", "environmental:apple_pie", "simplefarming:apple_pie", "simplefarming:blueberry_pie", "abnormals_delight:adzuki_cake_slice", "abnormals_delight:banana_cake_slice", "abnormals_delight:cherry_pantry", "abnormals_delight:chocolate_cake_slice", "abnormals_delight:cooked_duck_fillet", "abnormals_delight:cooked_venison_shanks", "abnormals_delight:duck_fillet", "abnormals_delight:mint_cake_slice", "abnormals_delight:necromium_knife", "abnormals_delight:passionfruit_glazed_duck", "abnormals_delight:seared_venison", "abnormals_delight:strawberry_cake_slice", "abnormals_delight:vanilla_cake_slice", "abnormals_delight:venison_shanks", "abnormals_delight:willow_pantry", "abnormals_delight:wisteria_pantry"] #When this list contains anything, the blacklist is ignored and instead only foods from here count. whitelist = [] diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json index 6b49f729a6..e8a7e09b77 100644 --- a/kubejs/assets/kubejs/lang/en_us.json +++ b/kubejs/assets/kubejs/lang/en_us.json @@ -25,6 +25,16 @@ "item.kubejs.red_nether_brick": "Red Nether Brick", "item.kubejs.ground_meat": "Ground Meat", "item.kubejs.amadron_survey_tools": "Amadron Survey Tools", + "block.kubejs.firmament": "Firmament", + + "item.kubejs.memory_basic_empty": "Prepared Basic Memory Chip", + "item.kubejs.memory_basic_filled": "Basic Memory Chip", + "item.kubejs.memory_advanced_empty": "Prepared Advanced Memory Chip", + "item.kubejs.memory_advanced_filled": "Advanced Memory Chip", + "item.kubejs.memory_elite_empty": "Prepared Elite Memory Chip", + "item.kubejs.memory_elite_filled": "Elite Memory Chip", + "item.kubejs.memory_ultimate_empty": "Prepared Ultimate Memory Chip", + "item.kubejs.memory_ultimate_filled": "Ultimate Memory Chip", "item.kubejs.machine_speed_augment_mk2": "Machine Speed MK2", "item.kubejs.machine_speed_augment_mk3": "Machine Speed MK3", @@ -36,8 +46,8 @@ "item.kubejs.dynamo_fuel_augment_mk3": "Dynamo Efficiency MK3", "item.kubejs.dynamo_fuel_augment_mk4": "Dynamo Efficiency MK4", - "item.kubejs.spirit_heat_exchanger": "Maxwellian Heat Exchanger", - "item.kubejs.spirit_heat_exchanger.occultism_spirit_tooltip": "%s resides within, ever vigilant against entropy.", + "item.kubejs.spirit_entropic_gateway": "Maxwellian Entropic Gateway", + "item.kubejs.spirit_entropic_gateway.occultism_spirit_tooltip": "%s resides within, ever vigilant against entropy.", "item.magicfeather.magicfeather.occultism_spirit_tooltip": "%s is bound to this feather.", "item.bloodmagic.soulsword.occultism_spirit_tooltip": "%s is bound to this sword.", "item.bloodmagic.soulaxe.occultism_spirit_tooltip": "%s is bound to this axe.", @@ -45,7 +55,7 @@ "item.bloodmagic.soulshovel.occultism_spirit_tooltip": "%s is bound to this shovel.", "item.bloodmagic.soulscythe.occultism_spirit_tooltip": "%s is bound to this scythe.", "item.integrateddynamics.logic_director.occultism_spirit_tooltip": "%s is bound to this logic director.", - "block.kubejs.firmament": "Firmament", + "item.mekanism.robit.occultism_spirit_tooltip": "%s is bound to this robit.", "item.kubejs.quintuple_alfsteel_ingot": "Quintuple Alfsteel Ingot", @@ -58,6 +68,7 @@ "ritual.occultism.sacrifice.gaia_guardian": "Guardian of Gaia", "ritual.occultism.sacrifice.pharaohs": "Pharaoh of Atum", "ritual.occultism.sacrifice.wither": "The Wither", + "ritual.occultism.sacrifice.camels": "Camel", "item.kubejs.craft_magical_feathers": "Ritual: Craft Magical Feathers.", "item.kubejs.craft_magical_feathers.tooltip": "Binds the Spirit of the Ender Dragon to grant Creative Flight.", @@ -87,12 +98,12 @@ "ritual.enigmatica.occultism/ritual/pink_wither.interrupted": "I'll be burnin' rubber, you'll be kissin' my ...", "ritual.enigmatica.occultism/ritual/pink_wither.conditions": "Not all requirements for this ritual are met.", - "item.kubejs.craft_spirit_heat_exchanger": "Ritual: Craft Maxwellian Heat Exchanger", - "item.kubejs.craft_spirit_heat_exchanger.tooltip": "Fission, brought to you by the Spirits of the Otherworld.", - "ritual.enigmatica.occultism/ritual/spirit_heat_exchanger.started": "Started binding Maxwell's Spirit.", - "ritual.enigmatica.occultism/ritual/spirit_heat_exchanger.finished": "Maxwell's Spirit bound successfully.", - "ritual.enigmatica.occultism/ritual/spirit_heat_exchanger.interrupted": "Maxwell's Spirit interrupted.", - "ritual.enigmatica.occultism/ritual/spirit_heat_exchanger.conditions": "Not all requirements for this ritual are met.", + "item.kubejs.craft_spirit_entropic_gateway": "Ritual: Craft Maxwellian Entropic Gateway.", + "item.kubejs.craft_spirit_entropic_gateway.tooltip": "Fission, brought to you by the Spirits of the Otherworld.", + "ritual.enigmatica.occultism/ritual/spirit_entropic_gateway.started": "Started binding Maxwell's Spirit.", + "ritual.enigmatica.occultism/ritual/spirit_entropic_gateway.finished": "Maxwell's Spirit bound successfully.", + "ritual.enigmatica.occultism/ritual/spirit_entropic_gateway.interrupted": "Maxwell's Spirit interrupted.", + "ritual.enigmatica.occultism/ritual/spirit_entropic_gateway.conditions": "Not all requirements for this ritual are met.", "item.kubejs.craft_soulsword": "Ritual: Craft Sentient Sword.", "item.kubejs.craft_soulsword.tooltip": "Bind a spirit into a Sentient Sword", @@ -150,6 +161,13 @@ "ritual.enigmatica.occultism/ritual/logic_director.interrupted": "Binding of djinni interrupted.", "ritual.enigmatica.occultism/ritual/logic_director.conditions": "Not all requirements for this ritual are met.", + "item.kubejs.craft_robit": "Ritual: Craft Sentient Robit.", + "item.kubejs.craft_robit.tooltip": "Binds a Foliot to pilot the Robit.", + "ritual.enigmatica.occultism/ritual/robit.started": "What is my purpose?", + "ritual.enigmatica.occultism/ritual/robit.finished": "You pass the salt.", + "ritual.enigmatica.occultism/ritual/robit.interrupted": "Binding of foliot interrupted.", + "ritual.enigmatica.occultism/ritual/robit.conditions": "Not all requirements for this ritual are met.", + "item.kubejs.suffused_aluminum": "Mana Suffused Aluminum Chunk", "item.kubejs.suffused_cloggrum": "Mana Suffused Cloggrum Chunk", "item.kubejs.suffused_cobalt": "Mana Suffused Cobalt Chunk", @@ -253,6 +271,9 @@ "item.kubejs.pneumatic_boots_package": "Pneumatic Boots Assembly Package", "item.kubejs.pneumatic_boots_assembly": "Unpacked Pneumatic Boots Assembly Package", + "item.kubejs.basic_memory_package": "Basic Memory Chip Assembly Package", + "item.kubejs.basic_memory_assembly": "Unpacked Basic Memory Chip Assembly Package", + "item.kubejs.1k_storage_part_package": "1k Storage Part Assembly Package", "item.kubejs.1k_storage_part_assembly": "Unpacked 1k Storage Part Assembly Package", "item.kubejs.4k_storage_part_package": "4k Storage Part Assembly Package", diff --git a/kubejs/assets/kubejs/textures/item/memory_advanced_empty.png b/kubejs/assets/kubejs/textures/item/memory_advanced_empty.png new file mode 100644 index 0000000000..92eb67f619 Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/memory_advanced_empty.png differ diff --git a/kubejs/assets/kubejs/textures/item/memory_advanced_filled.png b/kubejs/assets/kubejs/textures/item/memory_advanced_filled.png new file mode 100644 index 0000000000..e1057fe115 Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/memory_advanced_filled.png differ diff --git a/kubejs/assets/kubejs/textures/item/memory_basic_empty.png b/kubejs/assets/kubejs/textures/item/memory_basic_empty.png new file mode 100644 index 0000000000..7a5716d48b Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/memory_basic_empty.png differ diff --git a/kubejs/assets/kubejs/textures/item/memory_basic_filled.png b/kubejs/assets/kubejs/textures/item/memory_basic_filled.png new file mode 100644 index 0000000000..b57ecec02f Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/memory_basic_filled.png differ diff --git a/kubejs/assets/kubejs/textures/item/memory_elite_empty.png b/kubejs/assets/kubejs/textures/item/memory_elite_empty.png new file mode 100644 index 0000000000..5f0929ab9c Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/memory_elite_empty.png differ diff --git a/kubejs/assets/kubejs/textures/item/memory_elite_filled.png b/kubejs/assets/kubejs/textures/item/memory_elite_filled.png new file mode 100644 index 0000000000..c7f55efb66 Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/memory_elite_filled.png differ diff --git a/kubejs/assets/kubejs/textures/item/memory_ultimate_empty.png b/kubejs/assets/kubejs/textures/item/memory_ultimate_empty.png new file mode 100644 index 0000000000..33a60f6920 Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/memory_ultimate_empty.png differ diff --git a/kubejs/assets/kubejs/textures/item/memory_ultimate_filled.png b/kubejs/assets/kubejs/textures/item/memory_ultimate_filled.png new file mode 100644 index 0000000000..1761a110cd Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/memory_ultimate_filled.png differ diff --git a/kubejs/assets/kubejs/textures/item/spirit_heat_exchanger.png b/kubejs/assets/kubejs/textures/item/spirit_entropic_gateway.png similarity index 100% rename from kubejs/assets/kubejs/textures/item/spirit_heat_exchanger.png rename to kubejs/assets/kubejs/textures/item/spirit_entropic_gateway.png diff --git a/kubejs/assets/kubejs/textures/item/spirit_heat_exchanger.png.mcmeta b/kubejs/assets/kubejs/textures/item/spirit_entropic_gateway.png.mcmeta similarity index 100% rename from kubejs/assets/kubejs/textures/item/spirit_heat_exchanger.png.mcmeta rename to kubejs/assets/kubejs/textures/item/spirit_entropic_gateway.png.mcmeta diff --git a/kubejs/assets/pneumaticcraft/textures/item/compressed_iron_gear.png b/kubejs/assets/pneumaticcraft/textures/item/compressed_iron_gear.png new file mode 100755 index 0000000000..25320600f4 Binary files /dev/null and b/kubejs/assets/pneumaticcraft/textures/item/compressed_iron_gear.png differ diff --git a/kubejs/client_scripts/constants.js b/kubejs/client_scripts/constants.js index 74527d8ecd..64dad601b5 100644 --- a/kubejs/client_scripts/constants.js +++ b/kubejs/client_scripts/constants.js @@ -372,7 +372,10 @@ ee_types.forEach((type) => { `emendatusenigmatica:lapis_${type}`, `emendatusenigmatica:emerald_${type}`, `emendatusenigmatica:diamond_${type}`, - `emendatusenigmatica:coal_${type}` + `emendatusenigmatica:coal_${type}`, + `emendatusenigmatica:sapphire_${type}`, + `emendatusenigmatica:ruby_${type}`, + `emendatusenigmatica:iridium_${type}` ); }); diff --git a/kubejs/client_scripts/expert/item_modifiers/tooltips.js b/kubejs/client_scripts/expert/item_modifiers/tooltips.js index baae214b67..4589a1db0f 100644 --- a/kubejs/client_scripts/expert/item_modifiers/tooltips.js +++ b/kubejs/client_scripts/expert/item_modifiers/tooltips.js @@ -33,10 +33,7 @@ onEvent('item.tooltip', (event) => { items: ['tconstruct:seared_melter'], text: [disabledInExpert, Text.of('Use the Smeltery Controller instead.').aqua()] }, - { - items: ['kubejs:basic_circuit_package'], - text: [Text.of('Requires 64 Buckets of Memory Essence in the Memory Stick').aqua()] - }, + { items: ['resourcefulbees:t2_apiary', 'resourcefulbees:t3_apiary', 'resourcefulbees:t4_apiary'], text: [ diff --git a/kubejs/client_scripts/item_modifiers/jei_descriptions.js b/kubejs/client_scripts/item_modifiers/jei_descriptions.js index 089e346c47..bdefb7dff5 100644 --- a/kubejs/client_scripts/item_modifiers/jei_descriptions.js +++ b/kubejs/client_scripts/item_modifiers/jei_descriptions.js @@ -355,6 +355,10 @@ onEvent('jei.information', (event) => { text: [ `Tiered Beehives have been depreciated. Use the Hive Upgrade items on nests found in the world instead. Tiered Beehives can be converted to Hive Upgrades in a crafting grid.` ] + }, + { + items: ['upgrade_aquatic:flare_spawn_egg'], + text: [`Splash a Phantom with a Potion of Insomnia to convert it to a Flare.`] } ]; diff --git a/kubejs/client_scripts/ponder/tech/industrialforegoing/laser_drill.js b/kubejs/client_scripts/ponder/tech/industrialforegoing/laser_drill.js index 64480513a1..58696907fd 100644 --- a/kubejs/client_scripts/ponder/tech/industrialforegoing/laser_drill.js +++ b/kubejs/client_scripts/ponder/tech/industrialforegoing/laser_drill.js @@ -420,7 +420,7 @@ onEvent('ponder.registry', (event) => { scene.world().modifyTileNBT( tank1, { - tank: { FluidName: 'minecraft:lava', Amount: 100 } + tank: { FluidName: 'minecraft:lava', Amount: 1000 } }, true ); diff --git a/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js b/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js index 059ea7e952..8862f15147 100644 --- a/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js +++ b/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js @@ -107,9 +107,9 @@ onEvent('ponder.registry', (event) => { Block.id('industrialforegoing:common_black_hole_tank').with('subfacing', 'north').blockState, true ); - scene.idle(1); + scene.idle(20); scene.world().modifyTileNBT(tank1, { - tank: { FluidName: 'thermal:resin', Amount: Utils.random.nextInt(64000) } + tank: { FluidName: 'thermal:resin', Amount: 1000 } }); var tank2 = util.grid().at(3, 2, 3); @@ -120,9 +120,9 @@ onEvent('ponder.registry', (event) => { Block.id('industrialforegoing:common_black_hole_tank').with('subfacing', 'north').blockState, true ); - scene.idle(1); + scene.idle(20); scene.world().modifyTileNBT(tank2, { - tank: { FluidName: 'industrialforegoing:latex', Amount: Utils.random.nextInt(64000) } + tank: { FluidName: 'industrialforegoing:latex', Amount: 1000 } }); scene.world().showSection(util.select().fromTo(3, 2, 3, 5, 2, 3), Facing.down); @@ -303,6 +303,9 @@ onEvent('ponder.registry', (event) => { Block.id('industrialforegoing:supreme_black_hole_unit').with('subfacing', 'west').blockState, false ); + + scene.idle(1); + scene.world().modifyTileNBT( util.select().position(4, 1, 2), { diff --git a/kubejs/data/enigmatica/loot_tables/chests/quest_industrial_foregoing_loot_epic.json b/kubejs/data/enigmatica/loot_tables/chests/quest_industrial_foregoing_loot_epic.json index 3e808d3173..0aa5741b41 100644 --- a/kubejs/data/enigmatica/loot_tables/chests/quest_industrial_foregoing_loot_epic.json +++ b/kubejs/data/enigmatica/loot_tables/chests/quest_industrial_foregoing_loot_epic.json @@ -44,7 +44,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{TitaniumAugment:{Efficiency:0.8}}" + "tag": "{TitaniumAugment:{Efficiency:0.8f}}" } ] }, @@ -55,7 +55,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{TitaniumAugment:{Speed:3.0}}" + "tag": "{TitaniumAugment:{Speed:3.0f}}" } ] }, diff --git a/kubejs/data/farmingforblockheads/farmingforblockheads_compat/simplefarming_seeds.json b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/simplefarming_seeds.json new file mode 100644 index 0000000000..0ee86effff --- /dev/null +++ b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/simplefarming_seeds.json @@ -0,0 +1,23 @@ +{ + "modId": "supplementaries", + "group": { + "name": "Simple Farming Seeds", + "enabledByDefault": true, + "defaultPayment": { + "item": "minecraft:emerald" + }, + "defaultCategory": "farmingforblockheads:seeds" + }, + "customEntries": [ + { + "output": { + "item": "simplefarming:cumin_seeds" + } + }, + { + "output": { + "item": "simplefarming:quinoa_seeds" + } + } + ] +} diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/player/logged_in.js b/kubejs/server_scripts/enigmatica/kubejs/base/player/logged_in.js index 29bd3a4648..ab4500366d 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/player/logged_in.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/player/logged_in.js @@ -1,13 +1,14 @@ onEvent('player.logged_in', (event) => { + const startingItemsGameStage = 'starting_items'; randomWaystone = () => { const waystones = ['waystones:waystone', 'waystones:mossy_waystone', 'waystones:sandy_waystone']; return waystones[Math.floor(Math.random() * waystones.length + 1)]; }; - if (!event.hasGameStage('starting_items')) { + if (!event.hasGameStage(startingItemsGameStage)) { event.player.give(Item.of('ftbquests:book')); event.player.give(Item.of(randomWaystone())); - event.addGameStage('starting_items'); + event.addGameStage(startingItemsGameStage); } }); diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js index 61fffc2817..8aecf4a668 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js @@ -65,6 +65,8 @@ onEvent('recipes', (event) => { 'aquaculture:planks_from_driftwood', 'aquaculture:red_mushroom_from_red_shrooma', + 'architects_palette:smelting/charcoal_block_from_logs_that_burn_smoking', + 'astralsorcery:infuser/gold_ore', 'astralsorcery:shaped/marble/marble_slab', @@ -75,7 +77,7 @@ onEvent('recipes', (event) => { 'botania:fertilizer_dye', - 'botanypots:crafting/compact_hopper_botany_pot', + /botanypots:crafting\/compact_hopper/, 'byg:vermilion_sculk', '/byg:\\w+_glass_from_sand/', @@ -147,6 +149,10 @@ onEvent('recipes', (event) => { 'mekanism:processing/bronze/dust/from_infusing', 'mekanism:processing/bronze/ingot/from_infusing', 'mekanism:processing/lapis_lazuli/from_ore', + 'mekanism:processing/refined_glowstone/ingot_to_dust', + 'mekanism:processing/refined_obsidian/dust/from_ingot', + 'mekanism:osmium_compressor', + /mekanism:factory/, 'minecraft:crystal_glass', @@ -172,6 +178,8 @@ onEvent('recipes', (event) => { 'simplefarming:blueberry_pie', 'tconstruct:tools/modifiers/wither_bone_conversion', + 'tconstruct:tables/tinkers_anvil', + 'tconstruct:tables/scorched_anvil', 'thermal:compat/tconstruct/chiller_tconstruct_molten_debris_ingot', 'thermal:machine/smelter/smelter_alloy_netherite', @@ -230,7 +238,9 @@ onEvent('recipes', (event) => { /masonry:\w+wall_from_\w+_stonecutting/, /masonry:\w+slab_from_\w+_stonecutting/, /atum:.*dye$/, - /thermal:compat\/\w+\/\w+_ore/ + /thermal:compat\/\w+\/\w+_ore/, + /decorative_blocks:\w+_beam/, + /decorative_blocks_abnormals:\w+_beam/ ]; outputRemovals.forEach((removal) => { @@ -293,10 +303,6 @@ onEvent('recipes', (event) => { event.remove({ type: 'valhelsia_structures:axe_crafting' }); - beamRecipes.forEach((recipe) => { - event.remove({ output: recipe.output }); - }); - stonecuttables.forEach((stoneType) => { stoneType.stones.forEach((stone) => { event.remove({ type: 'minecraft:stonecutting', output: stone }); diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js index 21390acf1a..b3ac4bc81b 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js @@ -1,4 +1,5 @@ onEvent('recipes', (event) => { + const id_prefix = 'enigmatica:base/'; const recipes = [ { output: 'botania:enchanted_soil', inputs: ['minecraft:grass_block', 'botania:overgrowth_seed'] }, { output: 'minecraft:sticky_piston', inputs: ['minecraft:piston', '#forge:slimeballs'] }, @@ -556,6 +557,11 @@ onEvent('recipes', (event) => { { output: Item.of('byg:brimstone', 2), inputs: ['minecraft:netherrack', 'byg:sythian_wart_block'] + }, + { + output: 'minecraft:charcoal', + inputs: ['#chisel:charcoal'], + id: `${id_prefix}charcoal` } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/bloodmagic/alchemytable.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/bloodmagic/alchemytable.js index 7531744d84..d1890c4f46 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/bloodmagic/alchemytable.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/bloodmagic/alchemytable.js @@ -63,7 +63,7 @@ onEvent('recipes', (event) => { syphon: 150, ticks: 100, orbLevel: 2, - id: `${id_prefix}clay_from_sand_sigil` + id: 'bloodmagic:alchemytable/clay_from_sand_sigil' }, { inputs: ['#forge:rods/blaze'], diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/compote/composting.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/compote/composting.js new file mode 100644 index 0000000000..b6fb26561d --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/compote/composting.js @@ -0,0 +1,38 @@ +onEvent('recipes', (event) => { + const recipes = [ + /* + { + add: [{ item: 'minecraft:nether_star', chance: 1.0 }], + remove: [{ item: 'minecraft:wheat_seeds' }], + change: [{ item: 'minecraft:pumpkin', chance: 1.0 }] + }*/ + + { + add: [ + { item: 'minecraft:bamboo', chance: 0.5 }, + { item: 'sushigocrafting:rice_seeds', chance: 0.3 }, + { item: 'sushigocrafting:cucumber_seeds', chance: 0.3 }, + { item: 'sushigocrafting:soy_seeds', chance: 0.3 }, + { item: 'sushigocrafting:wasabi_seeds', chance: 0.3 }, + { item: 'sushigocrafting:sesame_seeds', chance: 0.3 }, + + { item: 'sushigocrafting:avocado_sapling', chance: 0.3 }, + { item: 'sushigocrafting:avocado_leaves', chance: 0.3 }, + { item: 'sushigocrafting:avocado', chance: 0.65 }, + { item: 'sushigocrafting:seaweed', chance: 0.3 }, + + { item: 'sushigocrafting:wasabi_root', chance: 0.65 }, + { item: 'sushigocrafting:soy_bean', chance: 0.65 }, + { item: 'sushigocrafting:cucumber', chance: 0.65 }, + { item: 'sushigocrafting:rice', chance: 0.65 } + ], + remove: [], + change: [] + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'compote:composting'; + event.custom(recipe); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/enigmatica/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/enigmatica/shaped.js index d26f9b1e22..0aeb0e3384 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/enigmatica/shaped.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/enigmatica/shaped.js @@ -13,217 +13,6 @@ onEvent('recipes', (event) => { }, id: `${id_prefix}minecraft/lava_bucket` }, - { - output: 'ironjetpacks:hardened_jetpack', - pattern: ['ABA', 'ECE', 'D D'], - key: { - A: 'powah:steel_energized', - B: 'powah:battery_hardened', - C: 'thermal:hazmat_chestplate', - D: 'ironjetpacks:hardened_thruster', - E: 'powah:reactor_hardened' - }, - id: `${id_prefix}ironjetpacks/hardened_jetpack` - }, - { - output: 'ironjetpacks:hardened_thruster', - pattern: [' B ', 'BDB', 'ACA'], - key: { - A: 'powah:steel_energized', - B: 'powah:capacitor_hardened', - C: 'powah:furnator_hardened', - D: 'powah:reactor_hardened' - }, - id: `${id_prefix}ironjetpacks/hardened_thruster` - }, - - { - output: 'ironjetpacks:invar_jetpack', - pattern: ['ABA', 'ECE', 'D D'], - key: { - A: '#forge:plates/invar', - B: 'thermal:upgrade_augment_1', - C: 'ironjetpacks:hardened_jetpack', - D: 'ironjetpacks:invar_thruster', - E: '#forge:gears/invar' - }, - id: `${id_prefix}ironjetpacks/invar_jetpack` - }, - { - output: 'ironjetpacks:invar_thruster', - pattern: [' B ', 'BDB', 'ACA'], - key: { - A: '#forge:plates/invar', - B: 'powah:capacitor_hardened', - C: 'powah:furnator_hardened', - D: '#forge:gears/invar' - }, - id: `${id_prefix}ironjetpacks/invar_thruster` - }, - { - output: 'ironjetpacks:blazing_jetpack', - pattern: ['ABA', 'ECE', 'D D'], - key: { - A: 'powah:crystal_blazing', - B: 'powah:battery_blazing', - C: 'ironjetpacks:invar_jetpack', - D: 'ironjetpacks:blazing_thruster', - E: 'powah:reactor_blazing' - }, - id: `${id_prefix}ironjetpacks/blazing_jetpack` - }, - { - output: 'ironjetpacks:blazing_thruster', - pattern: [' B ', 'BDB', 'ACA'], - key: { - A: 'powah:crystal_blazing', - B: 'powah:capacitor_blazing', - C: 'powah:furnator_blazing', - D: 'powah:reactor_blazing' - }, - id: `${id_prefix}ironjetpacks/blazing_thruster` - }, - { - output: 'ironjetpacks:signalum_jetpack', - pattern: ['ABA', 'ECE', 'D D'], - key: { - A: '#forge:plates/signalum', - B: 'thermal:upgrade_augment_2', - C: 'ironjetpacks:blazing_jetpack', - D: 'ironjetpacks:signalum_thruster', - E: '#forge:gears/signalum' - }, - id: `${id_prefix}ironjetpacks/signalum_jetpack` - }, - { - output: 'ironjetpacks:signalum_thruster', - pattern: [' B ', 'BDB', 'ACA'], - key: { - A: '#forge:plates/signalum', - B: 'powah:capacitor_blazing', - C: 'powah:furnator_blazing', - D: '#forge:gears/signalum' - }, - id: `${id_prefix}ironjetpacks/signalum_thruster` - }, - { - output: 'ironjetpacks:niotic_jetpack', - pattern: ['ABA', 'ECE', 'D D'], - key: { - A: 'powah:crystal_niotic', - B: 'powah:battery_niotic', - C: 'ironjetpacks:signalum_jetpack', - D: 'ironjetpacks:niotic_thruster', - E: 'powah:reactor_niotic' - }, - id: `${id_prefix}ironjetpacks/niotic_jetpack` - }, - { - output: 'ironjetpacks:niotic_thruster', - pattern: [' B ', 'BDB', 'ACA'], - key: { - A: 'powah:crystal_niotic', - B: 'powah:capacitor_niotic', - C: 'powah:furnator_niotic', - D: 'powah:reactor_niotic' - }, - id: `${id_prefix}ironjetpacks/niotic_thruster` - }, - - { - output: 'ironjetpacks:lumium_jetpack', - pattern: ['ABA', 'ECE', 'D D'], - key: { - A: '#forge:plates/lumium', - B: 'thermal:dynamo_fuel_augment', - C: 'ironjetpacks:niotic_jetpack', - D: 'ironjetpacks:lumium_thruster', - E: '#forge:gears/lumium' - }, - id: `${id_prefix}ironjetpacks/lumium_jetpack` - }, - { - output: 'ironjetpacks:lumium_thruster', - pattern: [' B ', 'BDB', 'ACA'], - key: { - A: '#forge:plates/lumium', - B: 'powah:capacitor_niotic', - C: 'powah:furnator_niotic', - D: '#forge:gears/lumium' - }, - id: `${id_prefix}ironjetpacks/lumium_thruster` - }, - - { - output: 'ironjetpacks:spirited_jetpack', - pattern: ['ABA', 'ECE', 'D D'], - key: { - A: 'powah:crystal_spirited', - B: 'powah:battery_spirited', - C: 'ironjetpacks:lumium_jetpack', - D: 'ironjetpacks:spirited_thruster', - E: 'powah:reactor_spirited' - }, - id: `${id_prefix}ironjetpacks/spirited_jetpack` - }, - { - output: 'ironjetpacks:spirited_thruster', - pattern: [' B ', 'BDB', 'ACA'], - key: { - A: 'powah:crystal_spirited', - B: 'powah:capacitor_spirited', - C: 'powah:furnator_spirited', - D: 'powah:reactor_spirited' - }, - id: `${id_prefix}ironjetpacks/spirited_thruster` - }, - { - output: 'ironjetpacks:enderium_jetpack', - pattern: ['ABA', 'ECE', 'D D'], - key: { - A: '#forge:plates/enderium', - B: 'thermal:upgrade_augment_3', - C: 'ironjetpacks:spirited_jetpack', - D: 'ironjetpacks:enderium_thruster', - E: '#forge:gears/enderium' - }, - id: `${id_prefix}ironjetpacks/enderium_jetpack` - }, - { - output: 'ironjetpacks:enderium_thruster', - pattern: [' B ', 'BDB', 'ACA'], - key: { - A: '#forge:plates/enderium', - B: 'powah:capacitor_spirited', - C: 'powah:furnator_spirited', - D: '#forge:gears/enderium' - }, - id: `${id_prefix}ironjetpacks/enderium_thruster` - }, - - { - output: 'ironjetpacks:nitro_jetpack', - pattern: ['ABA', 'ECE', 'D D'], - key: { - A: 'powah:crystal_nitro', - B: 'powah:battery_nitro', - C: 'ironjetpacks:enderium_jetpack', - D: 'ironjetpacks:nitro_thruster', - E: 'powah:reactor_nitro' - }, - id: `${id_prefix}ironjetpacks/nitro_jetpack` - }, - { - output: 'ironjetpacks:nitro_thruster', - pattern: [' B ', 'BDB', 'ACA'], - key: { - A: 'powah:crystal_nitro', - B: 'powah:capacitor_nitro', - C: 'powah:furnator_nitro', - D: 'powah:reactor_nitro' - }, - id: `${id_prefix}ironjetpacks/nitro_thruster` - }, { output: 'betterendforge:dense_snow', pattern: ['AAA', 'AAA', 'AAA'], @@ -781,18 +570,6 @@ onEvent('recipes', (event) => { }); }); - colors.forEach((color) => { - event - .shaped(`botanypots:${color}_botany_pot`, ['ADA', 'ABA', 'ACA'], { - A: `minecraft:${color}_terracotta`, - B: 'minecraft:flower_pot', - C: 'minecraft:bone_block', - D: 'minecraft:water_bucket' - }) - .id(`botanypots:crafting/${color}_botany_pot`); - event.remove({ id: `botanypots:crafting/compact_hopper_${color}_botany_pot` }); - }); - //Generate Forest Comb recipes for each tree type other than Oak (those are handled under newRecipes) treeRegistry.forEach((treeCategories) => { if (treeCategories.type == 'tree') { diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/environmental/sawing.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/environmental/sawing.js new file mode 100644 index 0000000000..8b40b123b8 --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/environmental/sawing.js @@ -0,0 +1,38 @@ +onEvent('recipes', (event) => { + const id_prefix = 'enigmatica:base/environmental/sawing/'; + const recipes = [ + // { + // ingredient: { + // tag: 'minecraft:planks' + // }, + // result: 'minecraft:stick', + // count: 2 + // } + ]; + + const beamRecipes = [ + { output: 'decorative_blocks:jungle_beam', input: '#minecraft:jungle_logs' }, + { output: 'decorative_blocks:birch_beam', input: '#minecraft:birch_logs' }, + { output: 'decorative_blocks:acacia_beam', input: '#minecraft:acacia_logs' }, + { output: 'decorative_blocks:dark_oak_beam', input: '#minecraft:dark_oak_logs' }, + { output: 'decorative_blocks:oak_beam', input: '#minecraft:oak_logs' }, + { output: 'decorative_blocks:spruce_beam', input: '#minecraft:spruce_logs' }, + { output: 'decorative_blocks:crimson_beam', input: '#minecraft:crimson_stems' }, + { output: 'decorative_blocks:warped_beam', input: '#minecraft:warped_stems' }, + + { output: 'decorative_blocks_abnormals:morado_beam', input: 'atmospheric:stripped_morado_log' }, + { output: 'decorative_blocks_abnormals:yucca_beam', input: 'atmospheric:stripped_yucca_log' }, + { output: 'decorative_blocks_abnormals:rosewood_beam', input: 'atmospheric:stripped_rosewood_log' }, + { output: 'decorative_blocks_abnormals:driftwood_beam', input: 'upgrade_aquatic:stripped_driftwood_log' }, + { output: 'decorative_blocks_abnormals:river_beam', input: 'upgrade_aquatic:stripped_river_log' } + ]; + beamRecipes.forEach((recipe) => { + let constructedRecipe = { + type: 'environmental:sawing', + ingredient: Ingredient.of(recipe.input), + result: recipe.output, + count: 1 + }; + event.custom(constructedRecipe).id(`${id_prefix}${recipe.output.replace(':', '_')}`); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_fluid.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_fluid.js index 7f9068a6be..6e292e64af 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_fluid.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_fluid.js @@ -116,10 +116,10 @@ onEvent('recipes', (event) => { entity: 'minecraft:empty', type: 'industrialforegoing:laser_drill_fluid' }); - + event.recipes.industrialforegoing.laser_drill_fluid({ type: 'industrialforegoing.laser_drill_fluid', - output: '{FluidName:"industrialforegoing:pink_slime",Amount:10}', + output: '{FluidName:"industrialforegoing:pink_slime",Amount:50}', rarity: [ { whitelist: {}, diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crafting_mek_data.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crafting_mek_data.js index 277d55e2ce..9d39853557 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crafting_mek_data.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crafting_mek_data.js @@ -11,105 +11,6 @@ onEvent('recipes', (event) => { }, id: 'mekanism:energy_cube/elite' }, - { - output: 'mekanism:elite_combining_factory', - pattern: ['ACA', 'IPI', 'ACA'], - key: { - P: { item: 'mekanism:advanced_combining_factory' }, - C: { tag: 'forge:circuits/elite' }, - I: { tag: 'forge:ingots/gold_bronze' }, - A: { tag: 'mekanism:alloys/reinforced' } - }, - id: 'mekanism:factory/elite/combining' - }, - { - output: 'mekanism:elite_enriching_factory', - pattern: ['ACA', 'IPI', 'ACA'], - key: { - P: { item: 'mekanism:advanced_enriching_factory' }, - C: { tag: 'forge:circuits/elite' }, - I: { tag: 'forge:ingots/gold_bronze' }, - A: { tag: 'mekanism:alloys/reinforced' } - }, - id: 'mekanism:factory/elite/enriching' - }, - { - output: 'mekanism:elite_crushing_factory', - pattern: ['ACA', 'IPI', 'ACA'], - key: { - P: { item: 'mekanism:advanced_crushing_factory' }, - C: { tag: 'forge:circuits/elite' }, - I: { tag: 'forge:ingots/gold_bronze' }, - A: { tag: 'mekanism:alloys/reinforced' } - }, - id: 'mekanism:factory/elite/crushing' - }, - { - output: 'mekanism:elite_compressing_factory', - pattern: ['ACA', 'IPI', 'ACA'], - key: { - P: { item: 'mekanism:advanced_compressing_factory' }, - C: { tag: 'forge:circuits/elite' }, - I: { tag: 'forge:ingots/gold_bronze' }, - A: { tag: 'mekanism:alloys/reinforced' } - }, - id: 'mekanism:factory/elite/compressing' - }, - { - output: 'mekanism:elite_smelting_factory', - pattern: ['ACA', 'IPI', 'ACA'], - key: { - P: { item: 'mekanism:advanced_smelting_factory' }, - C: { tag: 'forge:circuits/elite' }, - I: { tag: 'forge:ingots/gold_bronze' }, - A: { tag: 'mekanism:alloys/reinforced' } - }, - id: 'mekanism:factory/elite/smelting' - }, - { - output: 'mekanism:elite_sawing_factory', - pattern: ['ACA', 'IPI', 'ACA'], - key: { - P: { item: 'mekanism:advanced_sawing_factory' }, - C: { tag: 'forge:circuits/elite' }, - I: { tag: 'forge:ingots/gold_bronze' }, - A: { tag: 'mekanism:alloys/reinforced' } - }, - id: 'mekanism:factory/elite/sawing' - }, - { - output: 'mekanism:elite_purifying_factory', - pattern: ['ACA', 'IPI', 'ACA'], - key: { - P: { item: 'mekanism:advanced_purifying_factory' }, - C: { tag: 'forge:circuits/elite' }, - I: { tag: 'forge:ingots/gold_bronze' }, - A: { tag: 'mekanism:alloys/reinforced' } - }, - id: 'mekanism:factory/elite/purifying' - }, - { - output: 'mekanism:elite_injecting_factory', - pattern: ['ACA', 'IPI', 'ACA'], - key: { - P: { item: 'mekanism:advanced_injecting_factory' }, - C: { tag: 'forge:circuits/elite' }, - I: { tag: 'forge:ingots/gold_bronze' }, - A: { tag: 'mekanism:alloys/reinforced' } - }, - id: 'mekanism:factory/elite/injecting' - }, - { - output: 'mekanism:elite_infusing_factory', - pattern: ['ACA', 'IPI', 'ACA'], - key: { - P: { item: 'mekanism:advanced_infusing_factory' }, - C: { tag: 'forge:circuits/elite' }, - I: { tag: 'forge:ingots/gold_bronze' }, - A: { tag: 'mekanism:alloys/reinforced' } - }, - id: 'mekanism:factory/elite/infusing' - }, { output: 'mekanism:basic_fluid_tank', pattern: ['AIA', 'I I', 'AIA'], diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/blasting.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/blasting.js index d19c0ffdab..1611d2adc7 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/blasting.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/blasting.js @@ -1,56 +1,71 @@ onEvent('recipes', (event) => { + const id_prefix = 'enigmatica:base/minecraft/blasting/'; const recipes = [ { input: 'minecraft:rotten_flesh', output: 'occultism:tallow', - xp: 0.5 + xp: 0.5, + id: `${id_prefix}tallow_from_flesh` }, { input: '#forge:ores/ender', output: Item.of('#forge:shards/ender'), - xp: 0.5 + xp: 0.5, + id: `${id_prefix}ender_shard` }, { input: '#forge:ores/amber', output: Item.of('#forge:shards/amber'), - xp: 0.5 + xp: 0.5, + id: `${id_prefix}amber_shard` }, { input: '#forge:ores/netherite', output: Item.of('minecraft:netherite_scrap'), - xp: 2.0 + xp: 2.0, + id: `${id_prefix}netherite_scrap` }, { input: '#forge:ores/thallasium', output: Item.of('#forge:ingots/thallasium'), - xp: 0.7 + xp: 0.7, + id: `${id_prefix}thallasium` }, { input: '#forge:ores/elementium', output: Item.of('#forge:ingots/elementium'), - xp: 1.0 + xp: 1.0, + id: `${id_prefix}elementium` }, { input: 'farmersdelight:iron_knife', output: Item.of('#forge:nuggets/iron'), - xp: 0.1 + xp: 0.1, + id: `${id_prefix}iron_nugget_from_iron_knife` }, { input: 'farmersdelight:golden_knife', output: Item.of('#forge:nuggets/gold'), - xp: 0.1 + xp: 0.1, + id: `${id_prefix}gold_nugget_from_gold_knife` }, { input: Item.of('dustrial_decor:rusty_iron_ingot'), - output: Item.of('#forge:ingots/iron') + output: Item.of('#forge:ingots/iron'), + xp: 0.5, + id: `${id_prefix}iron_ingot_from_rusty_iron_ingot` }, { input: Item.of('dustrial_decor:rusty_iron_nugget'), - output: Item.of('#forge:nuggets/iron') + output: Item.of('#forge:nuggets/iron'), + xp: 0.5, + id: `${id_prefix}iron_nugget_from_rusty_iron_nugget` }, { input: '#forge:dusts/netherite', - output: Item.of('#forge:ingots/netherite') + output: Item.of('#forge:ingots/netherite'), + xp: 0.5, + id: `${id_prefix}netherite` }, { input: 'aquaculture:tin_can', @@ -61,7 +76,8 @@ onEvent('recipes', (event) => { { input: '#forge:ores/aquamarine', output: Item.of('#forge:gems/aquamarine'), - xp: 1.0 + xp: 1.0, + id: `${id_prefix}aquamarine` }, { input: '#forge:dusts/hop_graphite', @@ -72,62 +88,74 @@ onEvent('recipes', (event) => { { input: 'aquaculture:neptunium_helmet', output: Item.of('aquaculture:neptunium_nugget', 5), - xp: 5 + xp: 5, + id: `${id_prefix}neptunium_nugget_from_neptunium_helmet` }, { input: 'aquaculture:neptunium_chestplate', output: Item.of('aquaculture:neptunium_nugget', 8), - xp: 8 + xp: 8, + id: `${id_prefix}neptunium_nugget_from_neptunium_chestplate` }, { input: 'aquaculture:neptunium_leggings', output: Item.of('aquaculture:neptunium_nugget', 7), - xp: 7 + xp: 7, + id: `${id_prefix}neptunium_nugget_from_neptunium_leggings` }, { input: 'aquaculture:neptunium_boots', output: Item.of('aquaculture:neptunium_nugget', 4), - xp: 4 + xp: 4, + id: `${id_prefix}neptunium_nugget_from_neptunium_boots` }, { input: 'aquaculture:neptunium_pickaxe', output: Item.of('aquaculture:neptunium_nugget', 3), - xp: 3 + xp: 3, + id: `${id_prefix}neptunium_nugget_from_neptunium_pickaxe` }, { input: 'aquaculture:neptunium_axe', output: Item.of('aquaculture:neptunium_nugget', 3), - xp: 3 + xp: 3, + id: `${id_prefix}neptunium_nugget_from_neptunium_axe` }, { input: 'aquaculture:neptunium_shovel', output: Item.of('aquaculture:neptunium_nugget', 1), - xp: 1 + xp: 1, + id: `${id_prefix}neptunium_nugget_from_neptunium_shovel` }, { input: 'aquaculture:neptunium_sword', output: Item.of('aquaculture:neptunium_nugget', 2), - xp: 2 + xp: 2, + id: `${id_prefix}neptunium_nugget_from_neptunium_sword` }, { input: 'aquaculture:neptunium_hoe', output: Item.of('aquaculture:neptunium_nugget', 2), - xp: 2 + xp: 2, + id: `${id_prefix}neptunium_nugget_from_neptunium_hoe` }, { input: 'aquaculture:neptunium_fillet_knife', output: Item.of('aquaculture:neptunium_nugget', 2), - xp: 2 + xp: 2, + id: `${id_prefix}neptunium_nugget_from_neptunium_knife` }, { input: 'aquaculture:neptunium_fishing_rod', output: Item.of('aquaculture:neptunium_nugget', 2), - xp: 2 + xp: 2, + id: `${id_prefix}neptunium_nugget_from_neptunium_fishing_rod` }, { input: 'aquaculture:neptunium_bow', output: Item.of('aquaculture:neptunium_nugget', 3), - xp: 3 + xp: 3, + id: `${id_prefix}neptunium_nugget_from_neptunium_bow` }, { input: ['#forge:slag', 'thermal:rich_slag'], @@ -137,14 +165,10 @@ onEvent('recipes', (event) => { } ]; recipes.forEach((recipe) => { - const re = event.blasting(recipe.output, recipe.input); + const re = event.smelting(recipe.output, recipe.input).id(recipe.id); if (recipe.xp) { re.xp(recipe.xp); } - - if (recipe.id) { - re.id(recipe.id); - } }); }); diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/smelting.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/smelting.js index e19d5bfd64..bda8178520 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/smelting.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/smelting.js @@ -1,51 +1,65 @@ onEvent('recipes', (event) => { + const id_prefix = 'enigmatica:base/minecraft/smelting/'; const recipes = [ { input: '#forge:ores/ender', output: Item.of('#forge:shards/ender'), - xp: 0.5 + xp: 0.5, + id: `${id_prefix}ender_shard` }, { input: '#forge:ores/amber', output: Item.of('#forge:shards/amber'), - xp: 0.5 + xp: 0.5, + id: `${id_prefix}amber_shard` }, { input: '#forge:ores/netherite', output: Item.of('minecraft:netherite_scrap'), - xp: 2.0 + xp: 2.0, + id: `${id_prefix}netherite_scrap` }, { input: '#forge:ores/thallasium', output: Item.of('#forge:ingots/thallasium'), - xp: 0.7 + xp: 0.7, + id: `${id_prefix}thallasium` }, { input: '#forge:ores/elementium', output: Item.of('#forge:ingots/elementium'), - xp: 1.0 + xp: 1.0, + id: `${id_prefix}elementium` }, { input: 'farmersdelight:iron_knife', output: Item.of('#forge:nuggets/iron'), - xp: 0.1 + xp: 0.1, + id: `${id_prefix}iron_nugget_from_iron_knife` }, { input: 'farmersdelight:golden_knife', output: Item.of('#forge:nuggets/gold'), - xp: 0.1 + xp: 0.1, + id: `${id_prefix}gold_nugget_from_gold_knife` }, { input: Item.of('dustrial_decor:rusty_iron_ingot'), - output: Item.of('#forge:ingots/iron') + output: Item.of('#forge:ingots/iron'), + xp: 0.1, + id: `${id_prefix}iron_nugget_from_iron_knife` }, { input: Item.of('dustrial_decor:rusty_iron_nugget'), - output: Item.of('#forge:nuggets/iron') + output: Item.of('#forge:nuggets/iron'), + xp: 0.1, + id: `${id_prefix}iron_nugget_from_rusty_iron_nugget` }, { input: '#forge:dusts/netherite', - output: Item.of('#forge:ingots/netherite') + output: Item.of('#forge:ingots/netherite'), + xp: 0.1, + id: `${id_prefix}iron_ingot_from_rusty_iron_ingot` }, { input: 'aquaculture:tin_can', @@ -56,7 +70,8 @@ onEvent('recipes', (event) => { { input: '#forge:ores/aquamarine', output: Item.of('#forge:gems/aquamarine'), - xp: 1.0 + xp: 1.0, + id: `${id_prefix}aquamarine` }, { input: '#forge:dusts/hop_graphite', @@ -67,67 +82,80 @@ onEvent('recipes', (event) => { { input: 'aquaculture:neptunium_helmet', output: Item.of('aquaculture:neptunium_nugget', 5), - xp: 5 + xp: 5, + id: `${id_prefix}neptunium_nugget_from_neptunium_helmet` }, { input: 'aquaculture:neptunium_chestplate', output: Item.of('aquaculture:neptunium_nugget', 8), - xp: 8 + xp: 8, + id: `${id_prefix}neptunium_nugget_from_neptunium_chestplate` }, { input: 'aquaculture:neptunium_leggings', output: Item.of('aquaculture:neptunium_nugget', 7), - xp: 7 + xp: 7, + id: `${id_prefix}neptunium_nugget_from_neptunium_leggings` }, { input: 'aquaculture:neptunium_boots', output: Item.of('aquaculture:neptunium_nugget', 4), - xp: 4 + xp: 4, + id: `${id_prefix}neptunium_nugget_from_neptunium_boots` }, { input: 'aquaculture:neptunium_pickaxe', output: Item.of('aquaculture:neptunium_nugget', 3), - xp: 3 + xp: 3, + id: `${id_prefix}neptunium_nugget_from_neptunium_pickaxe` }, { input: 'aquaculture:neptunium_axe', output: Item.of('aquaculture:neptunium_nugget', 3), - xp: 3 + xp: 3, + id: `${id_prefix}neptunium_nugget_from_neptunium_axe` }, { input: 'aquaculture:neptunium_shovel', output: Item.of('aquaculture:neptunium_nugget', 1), - xp: 1 + xp: 1, + id: `${id_prefix}neptunium_nugget_from_neptunium_shovel` }, { input: 'aquaculture:neptunium_sword', output: Item.of('aquaculture:neptunium_nugget', 2), - xp: 2 + xp: 2, + id: `${id_prefix}neptunium_nugget_from_neptunium_sword` }, { input: 'aquaculture:neptunium_hoe', output: Item.of('aquaculture:neptunium_nugget', 2), - xp: 2 + xp: 2, + id: `${id_prefix}neptunium_nugget_from_neptunium_hoe` }, { input: 'aquaculture:neptunium_fillet_knife', output: Item.of('aquaculture:neptunium_nugget', 2), - xp: 2 + xp: 2, + id: `${id_prefix}neptunium_nugget_from_neptunium_knife` }, { input: 'aquaculture:neptunium_fishing_rod', output: Item.of('aquaculture:neptunium_nugget', 2), - xp: 2 + xp: 2, + id: `${id_prefix}neptunium_nugget_from_neptunium_fishing_rod` }, { input: 'aquaculture:neptunium_bow', output: Item.of('aquaculture:neptunium_nugget', 3), - xp: 3 + xp: 3, + id: `${id_prefix}neptunium_nugget_from_neptunium_bow` }, { input: 'atum:marl', output: 'atum:ceramic_white', - xp: 0.3 + xp: 0.3, + id: `${id_prefix}ceramic_white` } ]; @@ -144,22 +172,21 @@ onEvent('recipes', (event) => { ]; stones.forEach((cobblestone) => { - var stone = 'create:' + cobblestone; + var stone = `create:${cobblestone}`; if (!Item.exists(stone)) { - stone = 'minecraft:' + cobblestone; + stone = `minecraft:${cobblestone}`; } - recipes.push({ input: 'create:' + cobblestone + '_cobblestone', output: stone }); + recipes.push({ + input: `create:${cobblestone}_cobblestone`, + output: stone, + id: `${id_prefix}${cobblestone}_from_${cobblestone}_cobblestone` + }); }); recipes.forEach((recipe) => { - const re = event.smelting(recipe.output, recipe.input); - + const re = event.smelting(recipe.output, recipe.input).id(recipe.id); if (recipe.xp) { re.xp(recipe.xp); } - - if (recipe.id) { - re.id(recipe.id); - } }); }); diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/stonecutter.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/stonecutter.js index 7d5d825cd2..1c0f3ba6b7 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/stonecutter.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/stonecutter.js @@ -14,10 +14,6 @@ onEvent('recipes', (event) => { }); }); - beamRecipes.forEach((recipe) => { - event.stonecutting(recipe.output, recipe.input); - }); - stonecuttables.forEach((stoneType) => { var tag = `#enigmatica:stonecuttables/${stoneType.name}`; stoneType.stones.forEach((stone) => { @@ -97,10 +93,8 @@ onEvent('recipes', (event) => { var masonryTiledStoneTypes = masonryStoneTypes.concat(['endstone', 'netherrack', 'obsidian']); masonryTiledStoneTypes.forEach((stoneType) => { - masonryCuttingTypes.forEach((cuttingType) => { - event.stonecutting(`masonry:${stoneType}tiledslab`, `masonry:${stoneType}tiled`); - event.stonecutting(`masonry:${stoneType}tiledwall`, `masonry:${stoneType}tiled`); - }); + event.stonecutting(`masonry:${stoneType}tiledslab`, `masonry:${stoneType}tiled`); + event.stonecutting(`masonry:${stoneType}tiledwall`, `masonry:${stoneType}tiled`); }); ['#forge:dirt', '#forge:workbenches', '#forge:grass'].forEach((tag) => { diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/ritual.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/ritual.js index bab3da4094..6f7020e22a 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/ritual.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/ritual.js @@ -296,7 +296,7 @@ onEvent('recipes', (event) => { pentacle_id: 'occultism:summon_wild_greater_spirit', duration: 3, entity_to_sacrifice: { - tag: 'occultism:wild_hunt_sacrifices', + tag: 'occultism:humans', display_name: 'ritual.occultism.sacrifice.humans' }, entity_to_summon: 'occultism:wild_hunt_wither_skeleton', diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/storagedrawers/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/storagedrawers/shaped.js new file mode 100644 index 0000000000..0713022ff0 --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/storagedrawers/shaped.js @@ -0,0 +1,19 @@ +onEvent('recipes', (event) => { + const id_prefix = 'enigmatica:base/storagedrawers/'; + const recipes = [ + { + output: 'storagedrawers:shroud_key', + pattern: ['AB ', ' B ', ' C '], + key: { + A: '#forge:nuggets/gold', + B: '#forge:ingots/gold', + C: '#minecraft:signs' + }, + id: `${id_prefix}shroud_key` + } + ]; + + recipes.forEach((recipe) => { + event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/tconstruct/tools/severing.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/tconstruct/tools/severing.js new file mode 100644 index 0000000000..5a1fa61165 --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/tconstruct/tools/severing.js @@ -0,0 +1,17 @@ +onEvent('recipes', (event) => { + const id_prefix = 'enigmatica:base/tconstruct/tools/severing/'; + const recipes = [ + { + type: 'tconstruct:ageable_severing', + entity: { + types: ['minecraft:rabbit', 'atum:desert_rabbit'] + }, + adult_result: 'minecraft:rabbit_foot', + id: 'tconstruct:tools/severing/rabbit_foot' + } + ]; + + recipes.forEach((recipe) => { + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js index 2320a8a5f2..6d68b824e4 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js @@ -65,14 +65,6 @@ onEvent('recipes', (event) => { inputs: ['#forge:ingots/netherite', 'betterendforge:terminite_ingot'], outputs: [Item.of('betterendforge:aeternium_ingot')] }, - { - inputs: ['#forge:dusts/refined_obsidian', '#forge:ingots/osmium'], - outputs: [Item.of('mekanism:ingot_refined_obsidian')] - }, - { - inputs: ['#forge:dusts/glowstone', '#forge:ingots/osmium'], - outputs: [Item.of('mekanism:ingot_refined_glowstone')] - }, { inputs: ['byg:quartzite_sand'], outputs: [Item.of('minecraft:quartz'), Item.of('thermal:slag')] diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/enigmatica/camels.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/enigmatica/camels.js new file mode 100644 index 0000000000..0c5d6c5f5c --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/enigmatica/camels.js @@ -0,0 +1,3 @@ +onEvent('entity_type.tags', (event) => { + event.get('enigmatica:camels').add('atum:camel'); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/occultism/wild_hunt_sacrifices.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/occultism/wild_hunt_sacrifices.js index 5744334d39..54bde3644b 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/occultism/wild_hunt_sacrifices.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/occultism/wild_hunt_sacrifices.js @@ -1,4 +1 @@ -onEvent('entity_type.tags', (event) => { - let entities = ['atum:villager_male', 'atum:villager_female', 'undergarden:stoneborn']; - event.get('occultism:wild_hunt_sacrifices').add(entities); -}); +//TODO: Remove in 0.6.0. Tag Deprecated by Occultism. Now uses #occultism:humans diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/curios/goggles.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/curios/goggles.js index 48bf959b8f..891273f43f 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/curios/goggles.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/curios/goggles.js @@ -1,8 +1,9 @@ -onEvent('item.tags', (event) => { - event.add('curios:createplus.goggle_slot', [ - 'artifacts:night_vision_goggles', - 'botania:cosmetic_engineer_goggles', - 'botania:monocle', - 'advancedperipherals:ar_goggles' - ]); -}); +onEvent('item.tags', (event) => { + event.add('curios:createplus.goggle_slot', [ + 'artifacts:night_vision_goggles', + 'botania:cosmetic_engineer_goggles', + 'botania:monocle', + 'advancedperipherals:ar_goggles', + 'occultism:otherworld_goggles' + ]); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/dusts.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/dusts.js index 47812e9929..a4218a0e22 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/dusts.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/dusts.js @@ -17,6 +17,7 @@ onEvent('item.tags', (event) => { event.add('forge:dusts/starmetal', 'astralsorcery:stardust'); event.get('forge:dusts/lapis').add('mekanism:dust_lapis_lazuli'); + event.get('forge:dusts/netherite_scrap').add('mekanism:dust_netherite'); event.get('forge:dusts').remove('minecraft:prismarine_shard'); event.get('forge:dusts/prismarine').remove('minecraft:prismarine_shard'); diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/storage_blocks.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/storage_blocks.js index 45bbd20409..59ae35a9ae 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/storage_blocks.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/storage_blocks.js @@ -53,4 +53,10 @@ onEvent('item.tags', (event) => { event.add(storageBlocks + '/niotic', ['powah:niotic_crystal_block']); event.add(storageBlocks + '/spirited', ['powah:spirited_crystal_block']); event.add(storageBlocks + '/nitro', ['powah:nitro_crystal_block']); + + event.add(storageBlocks + '/bronze', ['#chisel:metals/bronze']); + event.add(storageBlocks + '/emerald', ['#chisel:emerald']); + event.add(storageBlocks + '/glowstone', ['#chisel:glowstone']); + event.add(storageBlocks + '/redstone', ['#chisel:redstone']); + event.add(storageBlocks + '/coal', ['#chisel:coal']); }); diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/ftbultimine/excluded_tools.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/ftbultimine/excluded_tools.js index cd7ae3e476..f4c395681b 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/ftbultimine/excluded_tools.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/ftbultimine/excluded_tools.js @@ -1,13 +1,7 @@ onEvent('item.tags', (event) => { - // Added by Ultimine natively - // event - // .get('ftbultimine:excluded_tools') - // .add([ - // 'mininggadgets:mininggadget', - // 'ars_nouveau:wand', - // 'ars_nouveau:novice_spell_book', - // 'ars_nouveau:creative_spell_book', - // 'ars_nouveau:archmage_spell_book', - // 'ars_nouveau:apprentice_spell_book' - // ]); + event.add('ftbultimine:excluded_tools/strict', [ + 'mininggadgets:mininggadget', + 'mininggadgets:mininggadget_simple', + 'mininggadgets:mininggadget_fancy' + ]); }); diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/beams.js b/kubejs/server_scripts/enigmatica/kubejs/constants/beams.js index 201df28786..b786a37479 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/constants/beams.js +++ b/kubejs/server_scripts/enigmatica/kubejs/constants/beams.js @@ -1,18 +1 @@ -//priority: 1000 - -const beamRecipes = [ - { output: 'decorative_blocks:jungle_beam', input: '#minecraft:jungle_logs' }, - { output: 'decorative_blocks:birch_beam', input: '#minecraft:birch_logs' }, - { output: 'decorative_blocks:acacia_beam', input: '#minecraft:acacia_logs' }, - { output: 'decorative_blocks:dark_oak_beam', input: '#minecraft:dark_oak_logs' }, - { output: 'decorative_blocks:oak_beam', input: '#minecraft:oak_logs' }, - { output: 'decorative_blocks:spruce_beam', input: '#minecraft:spruce_logs' }, - { output: 'decorative_blocks:crimson_beam', input: '#minecraft:crimson_stems' }, - { output: 'decorative_blocks:warped_beam', input: '#minecraft:warped_stems' }, - - { output: 'decorative_blocks_abnormals:morado_beam', input: 'atmospheric:stripped_morado_log' }, - { output: 'decorative_blocks_abnormals:yucca_beam', input: 'atmospheric:stripped_yucca_log' }, - { output: 'decorative_blocks_abnormals:rosewood_beam', input: 'atmospheric:stripped_rosewood_log' }, - { output: 'decorative_blocks_abnormals:driftwood_beam', input: 'upgrade_aquatic:stripped_driftwood_log' }, - { output: 'decorative_blocks_abnormals:river_beam', input: 'upgrade_aquatic:stripped_river_log' } -]; +//TODO: Remove in 0.6.0 diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js b/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js index e93deb0ed4..d32dc58ad8 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js +++ b/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js @@ -832,6 +832,12 @@ const cropRegistry = [ render: 'simplefarming:yam_crop', plant: 'simplefarming:yam', substrate: 'dirt' + }, + { + seed: 'sushigocrafting:wasabi_seeds', + render: 'sushigocrafting:wasabi_crop', + plant: 'sushigocrafting:wasabi_root', + substrate: 'dirt' } ] }, @@ -2169,6 +2175,12 @@ const cropRegistry = [ render: 'upgrade_aquatic:tongue_kelp', plant: 'upgrade_aquatic:tongue_kelp', substrate: 'water' + }, + { + seed: 'sushigocrafting:seaweed', + render: 'sushigocrafting:seaweed', + plant: 'sushigocrafting:seaweed', + substrate: 'water' } ] }, diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/general.js b/kubejs/server_scripts/enigmatica/kubejs/constants/general.js index 5ec8c00290..814dd5e2a8 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/constants/general.js +++ b/kubejs/server_scripts/enigmatica/kubejs/constants/general.js @@ -28,7 +28,9 @@ const modPriorities = [ 'byg', 'atum', 'betterendforge', - 'miniutilities' + 'miniutilities', + 'chipped', + 'chisel' ]; const lootChests = ['lootr:lootr_chest', 'lootr:lootr_barrel', 'lootr:lootr_trapped_chest']; diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js index ff5e1ed6d3..82e4a86004 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js +++ b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js @@ -42,7 +42,43 @@ const stonecuttables = [ 'chipped:stone_10', 'chipped:stone_11', 'chipped:stone_2', - 'chipped:stone_1' + 'chipped:stone_1', + 'chisel:stone_bricks/extra/largeornate', + 'chisel:stone_bricks/extra/poison', + 'chisel:stone_bricks/extra/sunken', + 'chisel:stone_bricks/cracked', + 'chisel:stone_bricks/solid_bricks', + 'chisel:stone_bricks/small_bricks', + 'chisel:stone_bricks/soft_bricks', + 'chisel:stone_bricks/cracked_bricks', + 'chisel:stone_bricks/triple_bricks', + 'chisel:stone_bricks/encased_bricks', + 'chisel:stone_bricks/chaotic_bricks', + 'chisel:stone_bricks/array', + 'chisel:stone_bricks/tiles_medium', + 'chisel:stone_bricks/tiles_large', + 'chisel:stone_bricks/tiles_small', + 'chisel:stone_bricks/chaotic_medium', + 'chisel:stone_bricks/chaotic_small', + 'chisel:stone_bricks/braid', + 'chisel:stone_bricks/dent', + 'chisel:stone_bricks/french_1', + 'chisel:stone_bricks/french_2', + 'chisel:stone_bricks/jellybean', + 'chisel:stone_bricks/layers', + 'chisel:stone_bricks/mosaic', + 'chisel:stone_bricks/ornate', + 'chisel:stone_bricks/panel', + 'chisel:stone_bricks/road', + 'chisel:stone_bricks/slanted', + 'chisel:stone_bricks/zag', + 'chisel:stone_bricks/circular', + 'chisel:stone_bricks/circularct', + 'chisel:stone_bricks/weaver', + 'chisel:stone_bricks/pillar', + 'chisel:stone_bricks/twisted', + 'chisel:stone_bricks/prism', + 'chisel:stone_bricks/cuts' ], // items added here can be cut from other blocks of this stone type, // but cannot be cut into other blocks from this type @@ -104,7 +140,40 @@ const stonecuttables = [ 'chipped:andesite_4', 'chipped:andesite_3', 'chipped:andesite_2', - 'chipped:andesite_1' + 'chipped:andesite_1', + 'chisel:andesite/cracked', + 'chisel:andesite/solid_bricks', + 'chisel:andesite/small_bricks', + 'chisel:andesite/soft_bricks', + 'chisel:andesite/cracked_bricks', + 'chisel:andesite/triple_bricks', + 'chisel:andesite/encased_bricks', + 'chisel:andesite/chaotic_bricks', + 'chisel:andesite/array', + 'chisel:andesite/tiles_medium', + 'chisel:andesite/tiles_large', + 'chisel:andesite/tiles_small', + 'chisel:andesite/chaotic_medium', + 'chisel:andesite/chaotic_small', + 'chisel:andesite/braid', + 'chisel:andesite/dent', + 'chisel:andesite/french_1', + 'chisel:andesite/french_2', + 'chisel:andesite/jellybean', + 'chisel:andesite/layers', + 'chisel:andesite/mosaic', + 'chisel:andesite/ornate', + 'chisel:andesite/panel', + 'chisel:andesite/road', + 'chisel:andesite/slanted', + 'chisel:andesite/zag', + 'chisel:andesite/circular', + 'chisel:andesite/circularct', + 'chisel:andesite/weaver', + 'chisel:andesite/pillar', + 'chisel:andesite/twisted', + 'chisel:andesite/prism', + 'chisel:andesite/cuts' ], onlyAsOutput: ['create:andesite_cobblestone'], onlyAsInput: ['minecraft:andesite'] @@ -310,7 +379,43 @@ const stonecuttables = [ 'chipped:cobblestone_4', 'chipped:cobblestone_3', 'chipped:cobblestone_2', - 'chipped:cobblestone_1' + 'chipped:cobblestone_1', + 'chisel:cobblestone/cracked', + 'chisel:cobblestone/solid_bricks', + 'chisel:cobblestone/small_bricks', + 'chisel:cobblestone/soft_bricks', + 'chisel:cobblestone/cracked_bricks', + 'chisel:cobblestone/triple_bricks', + 'chisel:cobblestone/encased_bricks', + 'chisel:cobblestone/chaotic_bricks', + 'chisel:cobblestone/array', + 'chisel:cobblestone/tiles_medium', + 'chisel:cobblestone/tiles_large', + 'chisel:cobblestone/tiles_small', + 'chisel:cobblestone/chaotic_medium', + 'chisel:cobblestone/chaotic_small', + 'chisel:cobblestone/braid', + 'chisel:cobblestone/dent', + 'chisel:cobblestone/french_1', + 'chisel:cobblestone/french_2', + 'chisel:cobblestone/jellybean', + 'chisel:cobblestone/layers', + 'chisel:cobblestone/mosaic', + 'chisel:cobblestone/ornate', + 'chisel:cobblestone/panel', + 'chisel:cobblestone/road', + 'chisel:cobblestone/slanted', + 'chisel:cobblestone/zag', + 'chisel:cobblestone/circular', + 'chisel:cobblestone/circularct', + 'chisel:cobblestone/weaver', + 'chisel:cobblestone/pillar', + 'chisel:cobblestone/twisted', + 'chisel:cobblestone/prism', + 'chisel:cobblestone/cuts', + 'chisel:cobblestone/extra/emboss', + 'chisel:cobblestone/extra/indent', + 'chisel:cobblestone/extra/marker' ], onlyAsOutput: [], onlyAsInput: [] @@ -466,7 +571,40 @@ const stonecuttables = [ 'chipped:diorite_4', 'chipped:diorite_3', 'chipped:diorite_2', - 'chipped:diorite_1' + 'chipped:diorite_1', + 'chisel:diorite/cracked', + 'chisel:diorite/solid_bricks', + 'chisel:diorite/small_bricks', + 'chisel:diorite/soft_bricks', + 'chisel:diorite/cracked_bricks', + 'chisel:diorite/triple_bricks', + 'chisel:diorite/encased_bricks', + 'chisel:diorite/chaotic_bricks', + 'chisel:diorite/array', + 'chisel:diorite/tiles_medium', + 'chisel:diorite/tiles_large', + 'chisel:diorite/tiles_small', + 'chisel:diorite/chaotic_medium', + 'chisel:diorite/chaotic_small', + 'chisel:diorite/braid', + 'chisel:diorite/dent', + 'chisel:diorite/french_1', + 'chisel:diorite/french_2', + 'chisel:diorite/jellybean', + 'chisel:diorite/layers', + 'chisel:diorite/mosaic', + 'chisel:diorite/ornate', + 'chisel:diorite/panel', + 'chisel:diorite/road', + 'chisel:diorite/slanted', + 'chisel:diorite/zag', + 'chisel:diorite/circular', + 'chisel:diorite/circularct', + 'chisel:diorite/weaver', + 'chisel:diorite/pillar', + 'chisel:diorite/twisted', + 'chisel:diorite/prism', + 'chisel:diorite/cuts' ], onlyAsOutput: ['create:diorite_cobblestone'], onlyAsInput: ['minecraft:diorite'] @@ -509,7 +647,40 @@ const stonecuttables = [ 'chipped:end_stone_4', 'chipped:end_stone_3', 'chipped:end_stone_2', - 'chipped:end_stone_1' + 'chipped:end_stone_1', + 'chisel:end_stone/cracked', + 'chisel:end_stone/solid_bricks', + 'chisel:end_stone/small_bricks', + 'chisel:end_stone/soft_bricks', + 'chisel:end_stone/cracked_bricks', + 'chisel:end_stone/triple_bricks', + 'chisel:end_stone/encased_bricks', + 'chisel:end_stone/chaotic_bricks', + 'chisel:end_stone/array', + 'chisel:end_stone/tiles_medium', + 'chisel:end_stone/tiles_large', + 'chisel:end_stone/tiles_small', + 'chisel:end_stone/chaotic_medium', + 'chisel:end_stone/chaotic_small', + 'chisel:end_stone/braid', + 'chisel:end_stone/dent', + 'chisel:end_stone/french_1', + 'chisel:end_stone/french_2', + 'chisel:end_stone/jellybean', + 'chisel:end_stone/layers', + 'chisel:end_stone/mosaic', + 'chisel:end_stone/ornate', + 'chisel:end_stone/panel', + 'chisel:end_stone/road', + 'chisel:end_stone/slanted', + 'chisel:end_stone/zag', + 'chisel:end_stone/circular', + 'chisel:end_stone/circularct', + 'chisel:end_stone/weaver', + 'chisel:end_stone/pillar', + 'chisel:end_stone/twisted', + 'chisel:end_stone/prism', + 'chisel:end_stone/cuts' ], onlyAsOutput: [], onlyAsInput: [] @@ -717,34 +888,6 @@ const stonecuttables = [ onlyAsOutput: [], onlyAsInput: [] }, - { - name: 'glowstone', - stones: [ - 'minecraft:glowstone', - 'chipped:glowstone_20', - 'chipped:glowstone_19', - 'chipped:glowstone_18', - 'chipped:glowstone_17', - 'chipped:glowstone_16', - 'chipped:glowstone_15', - 'chipped:glowstone_14', - 'chipped:glowstone_13', - 'chipped:glowstone_12', - 'chipped:glowstone_11', - 'chipped:glowstone_10', - 'chipped:glowstone_9', - 'chipped:glowstone_8', - 'chipped:glowstone_7', - 'chipped:glowstone_6', - 'chipped:glowstone_5', - 'chipped:glowstone_4', - 'chipped:glowstone_3', - 'chipped:glowstone_2', - 'chipped:glowstone_1' - ], - onlyAsOutput: [], - onlyAsInput: [] - }, { name: 'granite', stones: [ @@ -798,7 +941,40 @@ const stonecuttables = [ 'chipped:granite_4', 'chipped:granite_3', 'chipped:granite_2', - 'chipped:granite_1' + 'chipped:granite_1', + 'chisel:granite/cracked', + 'chisel:granite/solid_bricks', + 'chisel:granite/small_bricks', + 'chisel:granite/soft_bricks', + 'chisel:granite/cracked_bricks', + 'chisel:granite/triple_bricks', + 'chisel:granite/encased_bricks', + 'chisel:granite/chaotic_bricks', + 'chisel:granite/array', + 'chisel:granite/tiles_medium', + 'chisel:granite/tiles_large', + 'chisel:granite/tiles_small', + 'chisel:granite/chaotic_medium', + 'chisel:granite/chaotic_small', + 'chisel:granite/braid', + 'chisel:granite/dent', + 'chisel:granite/french_1', + 'chisel:granite/french_2', + 'chisel:granite/jellybean', + 'chisel:granite/layers', + 'chisel:granite/mosaic', + 'chisel:granite/ornate', + 'chisel:granite/panel', + 'chisel:granite/road', + 'chisel:granite/slanted', + 'chisel:granite/zag', + 'chisel:granite/circular', + 'chisel:granite/circularct', + 'chisel:granite/weaver', + 'chisel:granite/pillar', + 'chisel:granite/twisted', + 'chisel:granite/prism', + 'chisel:granite/cuts' ], onlyAsOutput: ['create:granite_cobblestone'], onlyAsInput: ['minecraft:granite'] @@ -1226,7 +1402,40 @@ const stonecuttables = [ 'chipped:prismarine_4', 'chipped:prismarine_3', 'chipped:prismarine_2', - 'chipped:prismarine_1' + 'chipped:prismarine_1', + 'chisel:prismarine/cracked', + 'chisel:prismarine/solid_bricks', + 'chisel:prismarine/small_bricks', + 'chisel:prismarine/soft_bricks', + 'chisel:prismarine/cracked_bricks', + 'chisel:prismarine/triple_bricks', + 'chisel:prismarine/encased_bricks', + 'chisel:prismarine/chaotic_bricks', + 'chisel:prismarine/array', + 'chisel:prismarine/tiles_medium', + 'chisel:prismarine/tiles_large', + 'chisel:prismarine/tiles_small', + 'chisel:prismarine/chaotic_medium', + 'chisel:prismarine/chaotic_small', + 'chisel:prismarine/braid', + 'chisel:prismarine/dent', + 'chisel:prismarine/french_1', + 'chisel:prismarine/french_2', + 'chisel:prismarine/jellybean', + 'chisel:prismarine/layers', + 'chisel:prismarine/mosaic', + 'chisel:prismarine/ornate', + 'chisel:prismarine/panel', + 'chisel:prismarine/road', + 'chisel:prismarine/slanted', + 'chisel:prismarine/zag', + 'chisel:prismarine/circular', + 'chisel:prismarine/circularct', + 'chisel:prismarine/weaver', + 'chisel:prismarine/pillar', + 'chisel:prismarine/twisted', + 'chisel:prismarine/prism', + 'chisel:prismarine/cuts' ], onlyAsOutput: [], onlyAsInput: [] @@ -1258,7 +1467,40 @@ const stonecuttables = [ 'chipped:purpur_block_4', 'chipped:purpur_block_3', 'chipped:purpur_block_2', - 'chipped:purpur_block_1' + 'chipped:purpur_block_1', + 'chisel:purpur/cracked', + 'chisel:purpur/solid_bricks', + 'chisel:purpur/small_bricks', + 'chisel:purpur/soft_bricks', + 'chisel:purpur/cracked_bricks', + 'chisel:purpur/triple_bricks', + 'chisel:purpur/encased_bricks', + 'chisel:purpur/chaotic_bricks', + 'chisel:purpur/array', + 'chisel:purpur/tiles_medium', + 'chisel:purpur/tiles_large', + 'chisel:purpur/tiles_small', + 'chisel:purpur/chaotic_medium', + 'chisel:purpur/chaotic_small', + 'chisel:purpur/braid', + 'chisel:purpur/dent', + 'chisel:purpur/french_1', + 'chisel:purpur/french_2', + 'chisel:purpur/jellybean', + 'chisel:purpur/layers', + 'chisel:purpur/mosaic', + 'chisel:purpur/ornate', + 'chisel:purpur/panel', + 'chisel:purpur/road', + 'chisel:purpur/slanted', + 'chisel:purpur/zag', + 'chisel:purpur/circular', + 'chisel:purpur/circularct', + 'chisel:purpur/weaver', + 'chisel:purpur/pillar', + 'chisel:purpur/twisted', + 'chisel:purpur/prism', + 'chisel:purpur/cuts' ], onlyAsOutput: [], onlyAsInput: [] @@ -1287,7 +1529,40 @@ const stonecuttables = [ 'chipped:quartz_block_4', 'chipped:quartz_block_3', 'chipped:quartz_block_2', - 'chipped:quartz_block_1' + 'chipped:quartz_block_1', + 'chisel:quartz/cracked', + 'chisel:quartz/solid_bricks', + 'chisel:quartz/small_bricks', + 'chisel:quartz/soft_bricks', + 'chisel:quartz/cracked_bricks', + 'chisel:quartz/triple_bricks', + 'chisel:quartz/encased_bricks', + 'chisel:quartz/chaotic_bricks', + 'chisel:quartz/array', + 'chisel:quartz/tiles_medium', + 'chisel:quartz/tiles_large', + 'chisel:quartz/tiles_small', + 'chisel:quartz/chaotic_medium', + 'chisel:quartz/chaotic_small', + 'chisel:quartz/braid', + 'chisel:quartz/dent', + 'chisel:quartz/french_1', + 'chisel:quartz/french_2', + 'chisel:quartz/jellybean', + 'chisel:quartz/layers', + 'chisel:quartz/mosaic', + 'chisel:quartz/ornate', + 'chisel:quartz/panel', + 'chisel:quartz/road', + 'chisel:quartz/slanted', + 'chisel:quartz/zag', + 'chisel:quartz/circular', + 'chisel:quartz/circularct', + 'chisel:quartz/weaver', + 'chisel:quartz/pillar', + 'chisel:quartz/twisted', + 'chisel:quartz/prism', + 'chisel:quartz/cuts' ], onlyAsOutput: [], onlyAsInput: [] @@ -1360,7 +1635,43 @@ const stonecuttables = [ 'chipped:red_sandstone_4', 'chipped:red_sandstone_3', 'chipped:red_sandstone_2', - 'chipped:red_sandstone_1' + 'chipped:red_sandstone_1', + 'chisel:red_sandstone/extra/bevel_skeleton', + 'chisel:red_sandstone/extra/glyphs', + 'chisel:red_sandstone/extra/small', + 'chisel:red_sandstone/cracked', + 'chisel:red_sandstone/solid_bricks', + 'chisel:red_sandstone/small_bricks', + 'chisel:red_sandstone/soft_bricks', + 'chisel:red_sandstone/cracked_bricks', + 'chisel:red_sandstone/triple_bricks', + 'chisel:red_sandstone/encased_bricks', + 'chisel:red_sandstone/chaotic_bricks', + 'chisel:red_sandstone/array', + 'chisel:red_sandstone/tiles_medium', + 'chisel:red_sandstone/tiles_large', + 'chisel:red_sandstone/tiles_small', + 'chisel:red_sandstone/chaotic_medium', + 'chisel:red_sandstone/chaotic_small', + 'chisel:red_sandstone/braid', + 'chisel:red_sandstone/dent', + 'chisel:red_sandstone/french_1', + 'chisel:red_sandstone/french_2', + 'chisel:red_sandstone/jellybean', + 'chisel:red_sandstone/layers', + 'chisel:red_sandstone/mosaic', + 'chisel:red_sandstone/ornate', + 'chisel:red_sandstone/panel', + 'chisel:red_sandstone/road', + 'chisel:red_sandstone/slanted', + 'chisel:red_sandstone/zag', + 'chisel:red_sandstone/circular', + 'chisel:red_sandstone/circularct', + 'chisel:red_sandstone/weaver', + 'chisel:red_sandstone/pillar', + 'chisel:red_sandstone/twisted', + 'chisel:red_sandstone/prism', + 'chisel:red_sandstone/cuts' ], onlyAsOutput: [], onlyAsInput: [] @@ -1426,7 +1737,43 @@ const stonecuttables = [ 'chipped:sandstone_4', 'chipped:sandstone_3', 'chipped:sandstone_2', - 'chipped:sandstone_1' + 'chipped:sandstone_1', + 'chisel:sandstone/extra/bevel_creeper', + 'chisel:sandstone/extra/glyphs', + 'chisel:sandstone/extra/small', + 'chisel:sandstone/cracked', + 'chisel:sandstone/solid_bricks', + 'chisel:sandstone/small_bricks', + 'chisel:sandstone/soft_bricks', + 'chisel:sandstone/cracked_bricks', + 'chisel:sandstone/triple_bricks', + 'chisel:sandstone/encased_bricks', + 'chisel:sandstone/chaotic_bricks', + 'chisel:sandstone/array', + 'chisel:sandstone/tiles_medium', + 'chisel:sandstone/tiles_large', + 'chisel:sandstone/tiles_small', + 'chisel:sandstone/chaotic_medium', + 'chisel:sandstone/chaotic_small', + 'chisel:sandstone/braid', + 'chisel:sandstone/dent', + 'chisel:sandstone/french_1', + 'chisel:sandstone/french_2', + 'chisel:sandstone/jellybean', + 'chisel:sandstone/layers', + 'chisel:sandstone/mosaic', + 'chisel:sandstone/ornate', + 'chisel:sandstone/panel', + 'chisel:sandstone/road', + 'chisel:sandstone/slanted', + 'chisel:sandstone/zag', + 'chisel:sandstone/circular', + 'chisel:sandstone/circularct', + 'chisel:sandstone/weaver', + 'chisel:sandstone/pillar', + 'chisel:sandstone/twisted', + 'chisel:sandstone/prism', + 'chisel:sandstone/cuts' ], onlyAsOutput: [], onlyAsInput: [] @@ -1735,6 +2082,281 @@ const stonecuttables = [ ], onlyAsOutput: [], onlyAsInput: [] + }, + { + name: 'tyrian', + stones: [ + 'chisel:tyrian/shining', + 'chisel:tyrian/tyrian', + 'chisel:tyrian/chaotic', + 'chisel:tyrian/softplate', + 'chisel:tyrian/rust', + 'chisel:tyrian/elaborate', + 'chisel:tyrian/routes', + 'chisel:tyrian/platform', + 'chisel:tyrian/platetiles', + 'chisel:tyrian/diagonal', + 'chisel:tyrian/dent', + 'chisel:tyrian/blueplating', + 'chisel:tyrian/black', + 'chisel:tyrian/black2', + 'chisel:tyrian/opening', + 'chisel:tyrian/plate' + ], + onlyAsOutput: [], + onlyAsInput: [] + }, + { + name: 'terracotta', + stones: [ + 'minecraft:terracotta', + 'chisel:terracotta/cracked', + 'chisel:terracotta/solid_bricks', + 'chisel:terracotta/small_bricks', + 'chisel:terracotta/soft_bricks', + 'chisel:terracotta/cracked_bricks', + 'chisel:terracotta/triple_bricks', + 'chisel:terracotta/encased_bricks', + 'chisel:terracotta/chaotic_bricks', + 'chisel:terracotta/array', + 'chisel:terracotta/tiles_medium', + 'chisel:terracotta/tiles_large', + 'chisel:terracotta/tiles_small', + 'chisel:terracotta/chaotic_medium', + 'chisel:terracotta/chaotic_small', + 'chisel:terracotta/braid', + 'chisel:terracotta/dent', + 'chisel:terracotta/french_1', + 'chisel:terracotta/french_2', + 'chisel:terracotta/jellybean', + 'chisel:terracotta/layers', + 'chisel:terracotta/mosaic', + 'chisel:terracotta/ornate', + 'chisel:terracotta/panel', + 'chisel:terracotta/road', + 'chisel:terracotta/slanted', + 'chisel:terracotta/zag', + 'chisel:terracotta/circular', + 'chisel:terracotta/circularct', + 'chisel:terracotta/weaver', + 'chisel:terracotta/pillar', + 'chisel:terracotta/twisted', + 'chisel:terracotta/prism', + 'chisel:terracotta/cuts' + ], + onlyAsOutput: [], + onlyAsInput: [] + }, + { + name: 'laboratory', + stones: [ + 'chisel:laboratory/wallpanel', + 'chisel:laboratory/dottedpanel', + 'chisel:laboratory/roundel', + 'chisel:laboratory/wallvents', + 'chisel:laboratory/largetile', + 'chisel:laboratory/smalltile', + 'chisel:laboratory/floortile', + 'chisel:laboratory/checkertile', + 'chisel:laboratory/fuzzscreen', + 'chisel:laboratory/largesteel', + 'chisel:laboratory/smallsteel', + 'chisel:laboratory/directionleft', + 'chisel:laboratory/directionright', + 'chisel:laboratory/infocon' + ], + onlyAsOutput: [], + onlyAsInput: [] + }, + { + name: 'futura', + stones: [ + 'chisel:futura/screen_metallic', + 'chisel:futura/screen_cyan', + 'chisel:futura/controller', + 'chisel:futura/wavy', + 'chisel:futura/controller_purple', + 'chisel:futura/uber_wavy' + ], + onlyAsOutput: [], + onlyAsInput: [] + }, + { + name: 'factory', + stones: [ + 'chisel:factory/dots', + 'chisel:factory/rust2', + 'chisel:factory/rust', + 'chisel:factory/platex', + 'chisel:factory/wireframewhite', + 'chisel:factory/wireframe', + 'chisel:factory/hazard', + 'chisel:factory/hazardorange', + 'chisel:factory/circuit', + 'chisel:factory/metalbox', + 'chisel:factory/goldplate', + 'chisel:factory/goldplating', + 'chisel:factory/grinder', + 'chisel:factory/plating', + 'chisel:factory/rustplates', + 'chisel:factory/column', + 'chisel:factory/frameblue', + 'chisel:factory/iceiceice', + 'chisel:factory/tilemosaic', + 'chisel:factory/vent', + 'chisel:factory/wireframeblue' + ], + onlyAsOutput: [], + onlyAsInput: [] + }, + { + name: 'mossy_cobblestone', + stones: [ + 'minecraft:mossy_cobblestone', + 'chisel:mossy_cobblestone/cracked', + 'chisel:mossy_cobblestone/solid_bricks', + 'chisel:mossy_cobblestone/small_bricks', + 'chisel:mossy_cobblestone/soft_bricks', + 'chisel:mossy_cobblestone/cracked_bricks', + 'chisel:mossy_cobblestone/triple_bricks', + 'chisel:mossy_cobblestone/encased_bricks', + 'chisel:mossy_cobblestone/chaotic_bricks', + 'chisel:mossy_cobblestone/array', + 'chisel:mossy_cobblestone/tiles_medium', + 'chisel:mossy_cobblestone/tiles_large', + 'chisel:mossy_cobblestone/tiles_small', + 'chisel:mossy_cobblestone/chaotic_medium', + 'chisel:mossy_cobblestone/chaotic_small', + 'chisel:mossy_cobblestone/braid', + 'chisel:mossy_cobblestone/dent', + 'chisel:mossy_cobblestone/french_1', + 'chisel:mossy_cobblestone/french_2', + 'chisel:mossy_cobblestone/jellybean', + 'chisel:mossy_cobblestone/layers', + 'chisel:mossy_cobblestone/mosaic', + 'chisel:mossy_cobblestone/ornate', + 'chisel:mossy_cobblestone/panel', + 'chisel:mossy_cobblestone/road', + 'chisel:mossy_cobblestone/slanted', + 'chisel:mossy_cobblestone/zag', + 'chisel:mossy_cobblestone/circular', + 'chisel:mossy_cobblestone/circularct', + 'chisel:mossy_cobblestone/weaver', + 'chisel:mossy_cobblestone/pillar', + 'chisel:mossy_cobblestone/twisted', + 'chisel:mossy_cobblestone/prism', + 'chisel:mossy_cobblestone/cuts', + 'chisel:mossy_cobblestone/extra/emboss', + 'chisel:mossy_cobblestone/extra/indent', + 'chisel:mossy_cobblestone/extra/marker' + ], + onlyAsOutput: [], + onlyAsInput: [] + }, + { + name: 'chisel_charcoal', //Recipe only costs 1 charcoal so can't also add storage blocks to this + stones: [ + 'chisel:charcoal/raw', + 'chisel:charcoal/cracked', + 'chisel:charcoal/solid_bricks', + 'chisel:charcoal/small_bricks', + 'chisel:charcoal/soft_bricks', + 'chisel:charcoal/cracked_bricks', + 'chisel:charcoal/triple_bricks', + 'chisel:charcoal/encased_bricks', + 'chisel:charcoal/chaotic_bricks', + 'chisel:charcoal/array', + 'chisel:charcoal/tiles_medium', + 'chisel:charcoal/tiles_large', + 'chisel:charcoal/tiles_small', + 'chisel:charcoal/chaotic_medium', + 'chisel:charcoal/chaotic_small', + 'chisel:charcoal/braid', + 'chisel:charcoal/dent', + 'chisel:charcoal/french_1', + 'chisel:charcoal/french_2', + 'chisel:charcoal/jellybean', + 'chisel:charcoal/layers', + 'chisel:charcoal/mosaic', + 'chisel:charcoal/ornate', + 'chisel:charcoal/panel', + 'chisel:charcoal/road', + 'chisel:charcoal/slanted', + 'chisel:charcoal/zag', + 'chisel:charcoal/circular', + 'chisel:charcoal/circularct', + 'chisel:charcoal/weaver', + 'chisel:charcoal/pillar', + 'chisel:charcoal/twisted', + 'chisel:charcoal/prism', + 'chisel:charcoal/cuts' + ], + onlyAsOutput: [], + onlyAsInput: [] + }, + { + name: 'bricks', + stones: [ + 'minecraft:bricks', + 'chisel:bricks/cracked', + 'chisel:bricks/solid_bricks', + 'chisel:bricks/small_bricks', + 'chisel:bricks/soft_bricks', + 'chisel:bricks/cracked_bricks', + 'chisel:bricks/triple_bricks', + 'chisel:bricks/encased_bricks', + 'chisel:bricks/chaotic_bricks', + 'chisel:bricks/array', + 'chisel:bricks/tiles_medium', + 'chisel:bricks/tiles_large', + 'chisel:bricks/tiles_small', + 'chisel:bricks/chaotic_medium', + 'chisel:bricks/chaotic_small', + 'chisel:bricks/braid', + 'chisel:bricks/dent', + 'chisel:bricks/french_1', + 'chisel:bricks/french_2', + 'chisel:bricks/jellybean', + 'chisel:bricks/layers', + 'chisel:bricks/mosaic', + 'chisel:bricks/ornate', + 'chisel:bricks/panel', + 'chisel:bricks/road', + 'chisel:bricks/slanted', + 'chisel:bricks/zag', + 'chisel:bricks/circular', + 'chisel:bricks/circularct', + 'chisel:bricks/weaver', + 'chisel:bricks/pillar', + 'chisel:bricks/twisted', + 'chisel:bricks/prism', + 'chisel:bricks/cuts' + ], + onlyAsOutput: [], + onlyAsInput: [] + }, + { + name: 'antiblock', + stones: [ + 'chisel:antiblock/white', + 'chisel:antiblock/orange', + 'chisel:antiblock/magenta', + 'chisel:antiblock/light_blue', + 'chisel:antiblock/yellow', + 'chisel:antiblock/lime', + 'chisel:antiblock/pink', + 'chisel:antiblock/gray', + 'chisel:antiblock/light_gray', + 'chisel:antiblock/cyan', + 'chisel:antiblock/purple', + 'chisel:antiblock/blue', + 'chisel:antiblock/brown', + 'chisel:antiblock/green', + 'chisel:antiblock/red', + 'chisel:antiblock/black' + ], + onlyAsOutput: [], + onlyAsInput: [] } ]; @@ -1751,7 +2373,12 @@ chippedTypes.forEach((chippedType) => { for (i = 1; i <= indexLength; i++) { stones.push(`chipped:${color}_${chippedType}_${i}`); } - + //@Chisel + if (['wool', 'carpet'].includes(chippedType)) { + stones.push(`chisel:${chippedType}/${color}/llama`); + stones.push(`chisel:${chippedType}/${color}/legacy`); + } + // stonecuttables.push({ name: `${color}_${chippedType}`, stones: stones, @@ -1760,3 +2387,83 @@ chippedTypes.forEach((chippedType) => { }); }); }); + +let chiselStoneTypes = [ + 'cracked', + 'solid_bricks', + 'small_bricks', + 'soft_bricks', + 'cracked_bricks', + 'triple_bricks', + 'encased_bricks', + 'chaotic_bricks', + 'array', + 'tiles_medium', + 'tiles_large', + 'tiles_small', + 'chaotic_medium', + 'chaotic_small', + 'braid', + 'dent', + 'french_1', + 'french_2', + 'jellybean', + 'layers', + 'mosaic', + 'ornate', + 'panel', + 'road', + 'slanted', + 'zag', + 'circular', + 'circularct', + 'weaver', + 'pillar', + 'twisted', + 'prism', + 'cuts' +]; +colors.forEach((color) => { + // @Chisel concrete + let stonecuttablesIndex = stonecuttables.findIndex((obj) => { + return obj.name == `${color}_concrete`; + }); + if (stonecuttablesIndex > -1) { + let stones = stonecuttables[stonecuttablesIndex].stones; + chiselStoneTypes.forEach((chiselStoneType) => { + stones.push(`chisel:concrete/${color}/${chiselStoneType}`); + }); + } +}); + +// @Chisel Planks +chiselPlankTypes = ['oak', 'spruce', 'birch', 'acacia', 'jungle', 'dark_oak']; +chiselPlankVariants = [ + 'large_planks', + 'crude_horizontal_planks', + 'vertical_planks', + 'crude_vertical_planks', + 'encased_planks', + 'encased_large_planks', + 'braced_planks', + 'shipping_crate', + 'paneling', + 'crude_paneling', + 'stacked', + 'smooth', + 'encased_smooth', + 'braid', + 'log_cabin' +]; +chiselPlankTypes.forEach((chiselPlankType) => { + let stones = [`minecraft:${chiselPlankType}_planks`]; + chiselPlankVariants.forEach((chiselPlankVariant) => { + stones.push(`chisel:planks/${chiselPlankType}/${chiselPlankVariant}`); + }); + stonecuttables.push({ + name: `${chiselPlankType}`, + stones: stones, + onlyAsOutput: [], + onlyAsInput: [] + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js index 65db871a4e..5e77a0a538 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js @@ -57,10 +57,15 @@ onEvent('recipes', (event) => { 'integrateddynamics:crafting/variable_transformer_output', 'integrateddynamics:crafting/variable_transformer_input', + 'mekanism:metallurgic_infusing/alloy/reinforced', + 'mekanism:metallurgic_infusing/alloy/atomic', + 'minecraft:book', 'minecraft:leather_to_stripes', 'minecraft:stick', + 'mininggadgets:upgrade_empty', + 'pedestals:ingot_gold_from_upgrades', 'pedestals:upgrades/breaker2', 'pedestals:upgrades/crafter1mk2', @@ -70,6 +75,7 @@ onEvent('recipes', (event) => { 'pneumaticcraft:explosion_crafting/compressed_iron_block', 'pneumaticcraft:explosion_crafting/compressed_iron_ingot', + 'pneumaticcraft:speed_upgrade', 'powah:crafting/dielectric_paste_2', 'powah:energizing/blazing_crystal_2', diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/astralsorcery/altar/altar_3_iridescent.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/astralsorcery/altar/altar_3_iridescent.js index 2951bdea31..fb89058f74 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/astralsorcery/altar/altar_3_iridescent.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/astralsorcery/altar/altar_3_iridescent.js @@ -385,6 +385,43 @@ onEvent('recipes', (event) => { 'astralsorcery:built_in_effect_attunement_sparkle' ], id: `${id_prefix}gaia_spreader` + }, + { + output: Item.of('2x mekanism:solar_neutron_activator'), + altar_type: 3, + duration: 720, + starlight: 7500, + pattern: ['A___A', 'BAAAB', 'CBBBC', '_CCC_', 'DEFED'], + key: { + A: { item: 'kubejs:observatory_lens' }, + B: { item: 'powah:solar_panel_niotic' }, + C: { item: 'mekanism:hdpe_sheet' }, + D: { tag: 'forge:plates/enderium' }, + E: { tag: 'forge:circuits/elite' }, + F: { tag: 'industrialforegoing:machine_frame/advanced' } + }, + focus_constellation: 'astralsorcery:horologium', + relay_inputs: [ + { item: 'astralsorcery:stardust' }, + { tag: 'forge:dusts/end_stone' }, + { tag: 'forge:dusts/iesnium' }, + { item: 'astralsorcery:stardust' }, + { tag: 'forge:dusts/end_stone' }, + { tag: 'forge:dusts/iesnium' } + ], + effects: [ + 'astralsorcery:built_in_effect_constellation_finish', + 'astralsorcery:built_in_effect_trait_relay_highlight', + 'astralsorcery:built_in_effect_discovery_central_beam', + 'astralsorcery:built_in_effect_trait_focus_circle', + 'astralsorcery:focus_dust_swirl', + 'astralsorcery:focus_edge', + 'astralsorcery:altar_focus_sparkle', + 'astralsorcery:altar_default_sparkle', + 'astralsorcery:built_in_effect_constellation_lines', + 'astralsorcery:built_in_effect_attunement_sparkle' + ], + id: 'mekanism:solar_neutron_activator' } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js index 6d41f80e1b..567c1fdfe1 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js @@ -255,6 +255,140 @@ onEvent('recipes', (event) => { I: 'pneumaticcraft:remote' }, id: 'integrateddynamics:crafting/logic_programmer' + }, + { + output: Item.of('2x portality:controller'), + pattern: ['ABBBA', 'CDEDC', 'CFGFC', 'CDEDC', 'ABBBA'], + key: { + A: 'portality:frame', + B: 'immersiveengineering:coil_lv', + C: 'immersiveengineering:electron_tube', + D: 'immersiveengineering:wirecoil_redstone', + E: 'pneumaticcraft:advanced_pcb', + F: 'immersiveengineering:current_transformer', + G: 'xnet:controller' + }, + id: 'portality:controller' + }, + { + output: 'rftoolsutility:environmental_controller', + pattern: ['ABBBA', 'BCDCB', 'BEFEB', 'BGHGB', 'ABBBA'], + key: { + A: 'powah:dielectric_casing', + B: 'thermal:enderium_glass', + C: 'immersiveengineering:tesla_coil', + D: 'powah:player_aerial_pearl', + E: 'powah:aerial_pearl', + F: '#industrialforegoing:machine_frame/supreme', + G: '#forge:circuits/ultimate', + H: 'kubejs:spirit_entropic_gateway' + }, + id: 'rftoolsutility:environmental_controller' + }, + { + output: 'mekanismgenerators:wind_generator', + pattern: ['ABC', 'DEF', 'DEF', 'DGF'], + key: { + A: 'pneumaticcraft:turbine_rotor', + B: 'immersiveengineering:dynamo', + C: '#forge:gears/compressed_iron', + D: 'pneumaticcraft:plastic', + E: 'engineersdecor:thick_steel_pole', + F: 'powah:capacitor_basic_large', + G: 'engineersdecor:thick_steel_pole_head' + }, + id: 'mekanismgenerators:generator/wind' + }, + { + output: 'mekanismgenerators:rotational_complex', + pattern: ['ABCCC', 'BDBFC', 'CBGBC', 'CEBDB', 'CCCBA'], + key: { + A: '#forge:circuits/elite', + B: '#forge:gears/compressed_iron', + C: '#xnet:cables', + D: '#mekanism:alloys/reinforced', + E: 'rftoolscontrol:node', + F: 'rftoolsbase:tablet', + G: '#industrialforegoing:machine_frame/advanced' + }, + id: 'mekanismgenerators:rotational_complex' + }, + { + output: 'mekanismgenerators:fusion_reactor_controller', + pattern: [' ABA ', ' ACDCA ', 'ACEFECA', 'BDGHGDB', 'ACEIECA', ' ACDCA ', ' ABA '], + key: { + A: 'mekanismgenerators:reactor_glass', + B: '#xnet:cables', + C: 'mekanismgenerators:fusion_reactor_frame', + D: '#xnet:advanced_connectors', + E: 'mekanism:ultimate_chemical_tank', + F: 'rftoolsutility:environmental_controller', + G: '#forge:circuits/ultimate', + H: 'mekanism:ultimate_fluid_tank', + I: 'rftoolsbase:tablet' + }, + id: 'mekanismgenerators:reactor/controller' + }, + { + output: 'mekanism:digital_miner', + pattern: ['AAAAA', 'BCDCB', 'EFGHE', 'AAAAA', 'II II'], + key: { + A: '#forge:sheetmetals/steel', + B: 'pneumaticcraft:smart_chest', + C: 'integrateddynamics:part_display_panel', + D: 'rftoolsbase:tablet', + E: 'integratedtunnels:part_importer_energy', + F: 'rftoolsutility:matter_transmitter', + G: 'mekanism:robit', + H: 'rftoolsutility:matter_receiver', + I: 'engineersdecor:thick_steel_pole_head' + }, + id: 'mekanism:digital_miner' + }, + { + output: 'mininggadgets:mininggadget_simple', + pattern: [' AAABBB', 'CDEFFF ', ' CGCBBB', 'H '], + key: { + A: 'immersiveengineering:toolupgrade_revolver_electro', + B: 'powah:dielectric_rod_horizontal', + C: 'mekanism:hdpe_sheet', + D: 'thermal:charge_bench', + E: 'rftoolsbase:infused_diamond', + F: 'industrialforegoing:laser_lens2', + G: 'thermal:upgrade_augment_2', + H: 'immersiveengineering:wooden_grip' + }, + id: 'mininggadgets:mininggadget_simple' + }, + { + output: 'mininggadgets:mininggadget_fancy', + pattern: [' AAABBB', 'CDEFFF ', ' CGCBBB', 'H '], + key: { + A: 'immersiveengineering:toolupgrade_revolver_electro', + B: 'powah:dielectric_rod_horizontal', + C: 'mekanism:hdpe_sheet', + D: 'thermal:charge_bench', + E: 'rftoolsbase:infused_diamond', + F: 'industrialforegoing:laser_lens6', + G: 'thermal:upgrade_augment_2', + H: 'immersiveengineering:wooden_grip' + }, + id: 'mininggadgets:mininggadget_fancy' + }, + { + output: 'mininggadgets:mininggadget', + pattern: [' AAABBB', 'CDEFFF ', ' CGCBBB', 'H '], + key: { + A: 'immersiveengineering:toolupgrade_revolver_electro', + B: 'powah:dielectric_rod_horizontal', + C: 'mekanism:hdpe_sheet', + D: 'thermal:charge_bench', + E: 'rftoolsbase:infused_diamond', + F: 'industrialforegoing:laser_lens3', + G: 'thermal:upgrade_augment_2', + H: 'immersiveengineering:wooden_grip' + }, + id: 'mininggadgets:mininggadget' } ]; @@ -285,7 +419,7 @@ onEvent('recipes', (event) => { J: 'xnet:advanced_connector_blue', K: 'xnet:netcable_blue', L: 'pneumaticcraft:heat_pipe', - M: 'kubejs:spirit_heat_exchanger', + M: 'kubejs:spirit_entropic_gateway', N: 'xnet:controller', O: `powah:furnator_${tier}`, P: 'create:fluid_pipe' diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/enigmatica/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/enigmatica/shaped.js index e83dcba804..38258b84f7 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/enigmatica/shaped.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/enigmatica/shaped.js @@ -3,7 +3,222 @@ onEvent('recipes', (event) => { return; } const id_prefix = 'enigmatica:expert/enigmatica/'; - const recipes = []; + const recipes = [ + , + { + output: 'ironjetpacks:hardened_jetpack', + pattern: ['ABA', 'ECE', 'DFD'], + key: { + A: 'mekanism:electrolytic_core', + B: 'powah:battery_hardened', + C: 'mekanism:jetpack', + D: 'ironjetpacks:hardened_thruster', + E: 'powah:energy_hopper_hardened', + F: Item.of('minecraft:water_bucket', '{display:{Name:\'{"text":"#MLG-YOLO"}\'}}').enchant( + 'minecraft:infinity', + 1 + ) + }, + id: `${id_prefix}ironjetpacks/hardened_jetpack` + }, + { + output: 'ironjetpacks:hardened_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: 'powah:steel_energized', + B: 'powah:capacitor_hardened', + C: 'powah:furnator_hardened', + D: 'powah:energy_hopper_hardened' + }, + id: `${id_prefix}ironjetpacks/hardened_thruster` + }, + { + output: 'ironjetpacks:invar_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: '#forge:plates/invar', + B: '#forge:gears/invar', + C: 'ironjetpacks:hardened_jetpack', + D: 'ironjetpacks:invar_thruster', + E: 'thermal:upgrade_augment_1' + }, + id: `${id_prefix}ironjetpacks/invar_jetpack` + }, + { + output: 'ironjetpacks:invar_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: '#forge:plates/invar', + B: 'powah:capacitor_hardened', + C: 'powah:furnator_hardened', + D: 'thermal:upgrade_augment_1' + }, + id: `${id_prefix}ironjetpacks/invar_thruster` + }, + { + output: 'ironjetpacks:blazing_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: 'powah:crystal_blazing', + B: 'powah:battery_blazing', + C: 'ironjetpacks:invar_jetpack', + D: 'ironjetpacks:blazing_thruster', + E: 'powah:energy_hopper_blazing' + }, + id: `${id_prefix}ironjetpacks/blazing_jetpack` + }, + { + output: 'ironjetpacks:blazing_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: 'powah:crystal_blazing', + B: 'powah:capacitor_blazing', + C: 'powah:furnator_blazing', + D: 'powah:energy_hopper_blazing' + }, + id: `${id_prefix}ironjetpacks/blazing_thruster` + }, + { + output: 'ironjetpacks:signalum_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: '#forge:plates/signalum', + B: '#forge:gears/signalum', + C: 'ironjetpacks:blazing_jetpack', + D: 'ironjetpacks:signalum_thruster', + E: 'thermal:upgrade_augment_2' + }, + id: `${id_prefix}ironjetpacks/signalum_jetpack` + }, + { + output: 'ironjetpacks:signalum_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: '#forge:plates/signalum', + B: 'powah:capacitor_blazing', + C: 'powah:furnator_blazing', + D: 'thermal:upgrade_augment_2' + }, + id: `${id_prefix}ironjetpacks/signalum_thruster` + }, + { + output: 'ironjetpacks:niotic_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: 'powah:crystal_niotic', + B: 'powah:battery_niotic', + C: 'ironjetpacks:signalum_jetpack', + D: 'ironjetpacks:niotic_thruster', + E: 'powah:energy_hopper_niotic' + }, + id: `${id_prefix}ironjetpacks/niotic_jetpack` + }, + { + output: 'ironjetpacks:niotic_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: 'powah:crystal_niotic', + B: 'powah:capacitor_niotic', + C: 'powah:furnator_niotic', + D: 'powah:energy_hopper_niotic' + }, + id: `${id_prefix}ironjetpacks/niotic_thruster` + }, + + { + output: 'ironjetpacks:lumium_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: '#forge:plates/lumium', + B: '#forge:gears/lumium', + C: 'ironjetpacks:niotic_jetpack', + D: 'ironjetpacks:lumium_thruster', + E: 'thermal:dynamo_fuel_augment' + }, + id: `${id_prefix}ironjetpacks/lumium_jetpack` + }, + { + output: 'ironjetpacks:lumium_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: '#forge:plates/lumium', + B: 'powah:capacitor_niotic', + C: 'powah:furnator_niotic', + D: 'thermal:dynamo_fuel_augment' + }, + id: `${id_prefix}ironjetpacks/lumium_thruster` + }, + + { + output: 'ironjetpacks:spirited_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: 'powah:crystal_spirited', + B: 'powah:battery_spirited', + C: 'ironjetpacks:lumium_jetpack', + D: 'ironjetpacks:spirited_thruster', + E: 'powah:energy_hopper_spirited' + }, + id: `${id_prefix}ironjetpacks/spirited_jetpack` + }, + { + output: 'ironjetpacks:spirited_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: 'powah:crystal_spirited', + B: 'powah:capacitor_spirited', + C: 'powah:furnator_spirited', + D: 'powah:energy_hopper_spirited' + }, + id: `${id_prefix}ironjetpacks/spirited_thruster` + }, + { + output: 'ironjetpacks:enderium_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: '#forge:plates/enderium', + B: '#forge:gears/enderium', + C: 'ironjetpacks:spirited_jetpack', + D: 'ironjetpacks:enderium_thruster', + E: 'thermal:upgrade_augment_3' + }, + id: `${id_prefix}ironjetpacks/enderium_jetpack` + }, + { + output: 'ironjetpacks:enderium_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: '#forge:plates/enderium', + B: 'powah:capacitor_spirited', + C: 'powah:furnator_spirited', + D: 'thermal:upgrade_augment_3' + }, + id: `${id_prefix}ironjetpacks/enderium_thruster` + }, + { + output: 'ironjetpacks:nitro_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: 'powah:crystal_nitro', + B: 'powah:battery_nitro', + C: 'ironjetpacks:enderium_jetpack', + D: 'ironjetpacks:nitro_thruster', + E: 'powah:energy_hopper_nitro' + }, + id: `${id_prefix}ironjetpacks/nitro_jetpack` + }, + { + output: 'ironjetpacks:nitro_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: 'powah:crystal_nitro', + B: 'powah:capacitor_nitro', + C: 'powah:furnator_nitro', + D: 'powah:energy_hopper_nitro' + }, + id: `${id_prefix}ironjetpacks/nitro_thruster` + } + ]; powahTiers.forEach(function (tier, index) { if (tier == 'starter') { diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/entangled/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/entangled/shaped.js new file mode 100644 index 0000000000..ec5c8d0e0f --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/entangled/shaped.js @@ -0,0 +1,47 @@ +onEvent('recipes', (event) => { + if (global.isExpertMode == false) { + return; + } + + /* + , + { + output: '', + pattern: ['', '', ''], + key: { + A: '' + }, + id: '' + } + */ + + const recipes = [ + { + output: 'entangled:block', + pattern: ['ABC', 'BDB', 'CBA'], + key: { + A: 'botania:corporea_spark', + B: 'botania:red_string', + C: 'botania:red_string_container', + D: 'botania:corporea_spark_master' + }, + id: 'entangled:block' + }, + { + output: 'entangled:item', + pattern: [' AB', ' CA', 'DE '], + key: { + A: '#forge:rods/lead', + B: 'eidolon:warped_sprouts', + C: 'botania:twig_wand', + D: 'botania:livingwood_twig', + E: 'betterendforge:leather_stripe' + }, + id: 'entangled:item' + } + ]; + + recipes.forEach((recipe) => { + event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/arc_furnace.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/arc_furnace.js index fd2ee9cfc8..58457bd6df 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/arc_furnace.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/arc_furnace.js @@ -2,20 +2,25 @@ onEvent('recipes', (event) => { if (global.isExpertMode == false) { return; } + const id_prefix = 'enigmatica:expert/immersiveengineering/arc_furnace'; var data = { recipes: [ { input1: Item.of('#forge:ingots/cobalt', 3), secondaries: ['thermal:blizz_powder'], - outputs: [Item.of('undergarden:froststeel_ingot', 3)] + outputs: [Item.of('undergarden:froststeel_ingot', 3)], + id: `${id_prefix}froststeel_ingot` + }, + { + input1: Ingredient.of('3x #forge:ingots/aluminum'), + secondaries: [Ingredient.of('4x #forge:dusts/lithium'), Ingredient.of('#forge:ingots/copper')], + outputs: [Item.of('4x mekanism:alloy_reinforced')], + id: `${id_prefix}alloy_reinforced` } ] }; data.recipes.forEach((recipe) => { - const re = event.recipes.immersiveengineering.arc_furnace(recipe.outputs, recipe.input1, recipe.secondaries); - if (recipe.id) { - re.id(recipe.id); - } + event.recipes.immersiveengineering.arc_furnace(recipe.outputs, recipe.input1, recipe.secondaries).id(recipe.id); }); }); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/blueprint.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/blueprint.js index 1c719e7975..3148a4f901 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/blueprint.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/blueprint.js @@ -42,6 +42,15 @@ onEvent('recipes', (event) => { count: 2 }, id: 'modularrouters:augment_core' + }, + { + inputs: [{ count: 3, base_ingredient: { tag: 'forge:ingots/steel' } }, { item: 'fluxnetworks:flux_dust' }], + category: 'components', + output: { + item: 'engineersdecor:metal_bar', + count: 12 + }, + id: 'engineersdecor:dependent/metal_bar_recipe' } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js index aa530b897a..e51d6fa743 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js @@ -2,7 +2,7 @@ onEvent('recipes', (event) => { if (global.isExpertMode == false) { return; } - + const id_prefix = 'enigmatica:expert/industrialforegoing/dissolution_chamber/'; const recipes = [ /* { @@ -27,14 +27,14 @@ onEvent('recipes', (event) => { */ { inputs: [ - 'minecraft:redstone', + 'immersiveengineering:tesla_coil', 'rftoolsbase:machine_frame', - 'minecraft:redstone', - 'minecraft:redstone_torch', - 'minecraft:redstone_torch', - '#forge:ingots/gold_copper', - '#forge:ingots/gold_copper', - '#forge:ingots/gold_copper' + 'immersiveengineering:tesla_coil', + 'immersiveengineering:coil_hv', + 'immersiveengineering:coil_hv', + 'powah:energy_discharger_spirited', + 'powah:capacitor_spirited', + 'powah:energy_discharger_spirited' ], inputFluid: 'tconstruct:molten_obsidian', inputFluidAmount: 1000, @@ -72,9 +72,408 @@ onEvent('recipes', (event) => { outputFluid: '', outputFluidAmount: 0, id: 'botanypots:crafting/hopper_botany_pot' + }, + { + inputs: [ + 'rftoolsutility:matter_receiver', + 'industrialforegoing:laser_lens14', + '#industrialforegoing:machine_frame/advanced', + 'minecraft:spawner', + 'minecraft:spawner' + ], + inputFluid: 'industrialforegoing:ether_gas', + inputFluidAmount: 200, + processingTime: 600, + outputItem: { item: 'rftoolsutility:spawner', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'rftoolsutility:spawner' + }, + { + inputs: [ + 'rftoolsutility:matter_transmitter', + 'industrialforegoing:laser_lens4', + '#industrialforegoing:machine_frame/simple', + '#forge:gears/lumium', + '#forge:gears/lumium' + ], + inputFluid: 'kubejs:pink_ender_slime', + inputFluidAmount: 500, + processingTime: 600, + outputItem: { item: 'rftoolsutility:matter_beamer', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'rftoolsutility:matter_beamer' + }, + { + inputs: [ + 'rftoolscontrol:cpu_core_500', + '#forge:alloys/advanced', + '#forge:alloys/advanced', + '#forge:circuits/basic', + 'kubejs:memory_advanced_filled' + ], + inputFluid: 'mekanism:lithium', + inputFluidAmount: 100, + processingTime: 300, + outputItem: { item: 'mekanism:advanced_control_circuit', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:control_circuit/advanced' + }, + { + inputs: [ + 'rftoolscontrol:cpu_core_1000', + '#forge:alloys/elite', + '#forge:alloys/elite', + '#forge:circuits/advanced', + 'kubejs:memory_elite_filled' + ], + inputFluid: 'industrialforegoing:ether_gas', + inputFluidAmount: 100, + processingTime: 300, + outputItem: { item: 'mekanism:elite_control_circuit', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:control_circuit/elite' + }, + { + inputs: [ + 'rftoolscontrol:cpu_core_2000', + '#forge:alloys/ultimate', + '#forge:alloys/ultimate', + '#forge:circuits/elite', + 'kubejs:memory_ultimate_filled' + ], + inputFluid: 'kubejs:pink_ender_slime', + inputFluidAmount: 100, + processingTime: 300, + outputItem: { item: 'mekanism:ultimate_control_circuit', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:control_circuit/ultimate' + }, + { + inputs: [ + '#forge:gears/osmium', + 'powah:blank_card', + '#forge:gears/osmium', + '#mekanism:alloys/infused', + '#mekanism:alloys/infused', + '#forge:nuggets/copper', + '#forge:nuggets/copper', + '#forge:nuggets/copper' + ], + inputFluid: 'pneumaticcraft:lubricant', + inputFluidAmount: 1000, + processingTime: 300, + outputItem: { item: 'mekanism:upgrade_speed', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:upgrade/speed' + }, + { + inputs: [ + '#forge:gears/cobalt', + 'powah:blank_card', + '#forge:gears/cobalt', + '#mekanism:alloys/reinforced', + '#mekanism:alloys/reinforced', + '#forge:nuggets/copper', + '#forge:nuggets/copper', + '#forge:nuggets/copper' + ], + inputFluid: 'mekanism:lithium', + inputFluidAmount: 1000, + processingTime: 300, + outputItem: { item: 'mekanism:upgrade_energy', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:upgrade/energy' + }, + { + inputs: [ + '#forge:gears/bronze', + 'powah:blank_card', + '#forge:gears/bronze', + '#mekanism:alloys/infused', + '#mekanism:alloys/infused', + '#forge:nuggets/copper', + '#forge:nuggets/copper', + '#forge:nuggets/copper' + ], + inputFluid: 'industrialforegoing:latex', + inputFluidAmount: 1000, + processingTime: 300, + outputItem: { item: 'mekanism:upgrade_filter', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:upgrade/filter' + }, + { + inputs: [ + '#forge:gears/silver', + 'powah:blank_card', + '#forge:gears/silver', + '#mekanism:alloys/reinforced', + '#mekanism:alloys/reinforced', + '#forge:nuggets/copper', + '#forge:nuggets/copper', + '#forge:nuggets/copper' + ], + inputFluid: 'industrialforegoing:ether_gas', + inputFluidAmount: 1000, + processingTime: 300, + outputItem: { item: 'mekanism:upgrade_gas', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:upgrade/gas' + }, + { + inputs: [ + '#thermal:rockwool', + 'powah:blank_card', + '#thermal:rockwool', + '#thermal:rockwool', + '#thermal:rockwool', + '#forge:nuggets/copper', + '#forge:nuggets/copper', + '#forge:nuggets/copper' + ], + inputFluid: 'integrateddynamics:liquid_chorus', + inputFluidAmount: 1000, + processingTime: 300, + outputItem: { item: 'mekanism:upgrade_muffling', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:upgrade/muffling' + }, + { + inputs: [ + 'dustrial_decor:anchor', + 'powah:blank_card', + 'dustrial_decor:anchor', + '#mekanism:alloys/infused', + '#mekanism:alloys/infused', + '#forge:nuggets/copper', + '#forge:nuggets/copper', + '#forge:nuggets/copper' + ], + inputFluid: 'kubejs:pink_ender_slime', + inputFluidAmount: 1000, + processingTime: 300, + outputItem: { item: 'mekanism:upgrade_anchor', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:upgrade/anchor' + }, + { + inputs: [ + '#forge:pellets/polonium', + '#industrialforegoing:machine_frame/supreme', + '#forge:pellets/polonium', + '#forge:pellets/polonium', + '#forge:pellets/polonium', + 'mekanism:hdpe_sheet', + '#forge:circuits/ultimate', + 'mekanism:hdpe_sheet' + ], + inputFluid: 'immersiveengineering:concrete', + inputFluidAmount: 1000, + processingTime: 6000, + outputItem: { item: 'mekanism:sps_casing', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:sps_casing' + }, + { + inputs: [ + 'mekanism:ultimate_induction_cell', + 'immersiveengineering:coil_mv', + 'mekanism:ultimate_induction_cell', + '#forge:circuits/ultimate', + '#forge:circuits/ultimate', + '#forge:pellets/polonium', + 'mekanism:laser', + '#forge:pellets/polonium' + ], + inputFluid: 'industrialforegoing:ether_gas', + inputFluidAmount: 1000, + processingTime: 6000, + outputItem: { item: 'mekanism:supercharged_coil', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:supercharged_coil' + }, + { + inputs: [ + 'mekanism:hdpe_sheet', + '#industrialforegoing:machine_frame/simple', + 'mekanism:hdpe_sheet', + 'mekanism:hdpe_sheet', + 'mekanism:hdpe_sheet' + ], + inputFluid: 'immersiveengineering:concrete', + inputFluidAmount: 4000, + processingTime: 100, + outputItem: { item: 'mekanism:induction_casing', count: 4 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:induction/casing' + }, + { + inputs: [ + 'mekanismgenerators:electromagnetic_coil', + '#forge:pellets/polonium', + '#mekanism:alloys/atomic', + 'powah:dielectric_casing', + 'rftoolscontrol:node', + '#xnet:cables', + '#xnet:cables', + '#xnet:cables' + ], + inputFluid: 'industrialforegoing:ether_gas', + inputFluidAmount: 100, + processingTime: 600, + outputItem: { item: 'mekanismgenerators:fusion_reactor_frame', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanismgenerators:reactor/frame' + }, + { + inputs: [ + 'mekanism:steel_casing', + 'immersiveengineering:wire_steel', + 'immersiveengineering:wire_steel', + 'immersiveengineering:wire_steel', + 'immersiveengineering:wire_steel' + ], + inputFluid: 'immersiveengineering:concrete', + inputFluidAmount: 1000, + processingTime: 600, + outputItem: { item: 'mekanismgenerators:fission_reactor_casing', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanismgenerators:fission_reactor/casing' + }, + { + inputs: ['#forge:ingots/lumium'], + inputFluid: 'thermal:glowstone', + inputFluidAmount: 250, + processingTime: 100, + outputItem: { item: 'mekanism:ingot_refined_glowstone', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:processing/refined_glowstone/ingot/from_dust' + }, + { + inputs: [ + '#forge:circuits/basic', + 'mekanism:module_base', + '#forge:circuits/basic', + '#forge:ingots/refined_obsidian', + '#forge:ingots/refined_obsidian', + '#forge:ingots/refined_glowstone', + '#forge:ingots/refined_glowstone' + ], + inputFluid: 'industrialforegoing:latex', + inputFluidAmount: 250, + processingTime: 100, + outputItem: { item: 'mekanism:basic_tier_installer', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:tier_installer/basic' + }, + { + inputs: [ + '#forge:circuits/advanced', + 'mekanism:module_base', + '#forge:circuits/advanced', + '#forge:ingots/refined_obsidian', + '#forge:ingots/refined_obsidian', + '#forge:ingots/refined_glowstone', + '#forge:ingots/refined_glowstone' + ], + inputFluid: 'mekanism:lithium', + inputFluidAmount: 250, + processingTime: 100, + outputItem: { item: 'mekanism:advanced_tier_installer', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:tier_installer/advanced' + }, + { + inputs: [ + '#forge:circuits/elite', + 'mekanism:module_base', + '#forge:circuits/elite', + '#forge:ingots/refined_obsidian', + '#forge:ingots/refined_obsidian', + '#forge:ingots/refined_glowstone', + '#forge:ingots/refined_glowstone' + ], + inputFluid: 'industrialforegoing:ether_gas', + inputFluidAmount: 250, + processingTime: 100, + outputItem: { item: 'mekanism:elite_tier_installer', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:tier_installer/elite' + }, + { + inputs: [ + '#forge:circuits/ultimate', + 'mekanism:module_base', + '#forge:circuits/ultimate', + '#forge:ingots/refined_obsidian', + '#forge:ingots/refined_obsidian', + '#forge:ingots/refined_glowstone', + '#forge:ingots/refined_glowstone' + ], + inputFluid: 'kubejs:pink_ender_slime', + inputFluidAmount: 250, + processingTime: 100, + outputItem: { item: 'mekanism:ultimate_tier_installer', count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: 'mekanism:tier_installer/ultimate' } ]; + colors.forEach((color) => { + recipes.push( + { + inputs: [ + 'atum:fertile_soil', + 'mythicbotany:aquapanthus', + 'atum:fertile_soil', + `minecraft:${color}_terracotta`, + `minecraft:${color}_terracotta`, + `minecraft:${color}_terracotta`, + `minecraft:${color}_terracotta`, + `minecraft:${color}_terracotta` + ], + inputFluid: 'industrialforegoing:sewage', + inputFluidAmount: 8000, + processingTime: 600, + outputItem: { item: `botanypots:${color}_botany_pot`, count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: `botanypots:crafting/${color}_botany_pot` + }, + { + inputs: [`botanypots:${color}_botany_pot`, 'ars_nouveau:sylph_charm', 'naturesaura:grated_chute'], + inputFluid: 'materialis:molten_fairy', + inputFluidAmount: 1296, + processingTime: 600, + outputItem: { item: `botanypots:hopper_${color}_botany_pot`, count: 1 }, + outputFluid: '', + outputFluidAmount: 0, + id: `botanypots:crafting/hopper_${color}_botany_pot` + } + ); + }); + recipes.forEach((recipe) => { let ingredients = []; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/laser_drill_fluid.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/laser_drill_fluid.js index 0a9740eb1e..a217412a95 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/laser_drill_fluid.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/laser_drill_fluid.js @@ -5,7 +5,7 @@ onEvent('recipes', (event) => { const id_prefix = 'enigmatica:expert/industrialforegoing/laser_drill_fluids/'; const recipes = [ { - output: '{FluidName:"industrialforegoing:meat",Amount:100}', + output: '{FluidName:"industrialforegoing:meat",Amount:1000}', rarity: [ { whitelist: {}, diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/integrateddynamics/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/integrateddynamics/shaped.js index 1a00216399..866881c2c4 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/integrateddynamics/shaped.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/integrateddynamics/shaped.js @@ -22,7 +22,7 @@ onEvent('recipes', (event) => { C: 'integrateddynamics:menril_wood', D: 'pneumaticcraft:smart_chest', E: 'pneumaticcraft:upgrade_matrix', - F: 'pneumaticcraft:memory_stick' + F: 'kubejs:memory_advanced_filled' }, id: 'integrateddynamics:crafting/variablestore' }, diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/kubejs/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/kubejs/shaped.js index 65633b7a6b..05bc79071f 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/kubejs/shaped.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/kubejs/shaped.js @@ -18,17 +18,12 @@ onEvent('recipes', (event) => { const recipes = [ { output: 'kubejs:basic_circuit_package', - pattern: ['AAA', 'EDB', 'CCC'], + pattern: ['AA ', 'BB ', 'CCD'], key: { A: 'refinedstorage:improved_processor', - - B: Item.of( - 'pneumaticcraft:memory_stick', - '{BlockEntityTag:{SavedTanks:{Tank:{FluidName:"pneumaticcraft:memory_essence",Amount:64000}}}}' - ).weakNBT(), + B: 'kubejs:memory_basic_filled', C: 'pneumaticcraft:printed_circuit_board', - D: 'mekanism:cardboard_box', - E: 'immersiveengineering:wirecoil_redstone' + D: 'mekanism:cardboard_box' }, id: `${id_prefix}basic_circuit_package` }, @@ -51,6 +46,16 @@ onEvent('recipes', (event) => { }, id: `${id_prefix}red_nether_brick` }, + { + output: 'kubejs:basic_memory_package', + pattern: ['AAA', 'AAA', 'BC '], + key: { + A: 'rftoolscontrol:ram_chip', + B: 'mekanism:cardboard_box', + C: 'pneumaticcraft:unassembled_pcb' + }, + id: `${id_prefix}basic_memory_package` + }, // Storage Parts { diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/mek_data.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/mek_data.js new file mode 100644 index 0000000000..05f03f4064 --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/mek_data.js @@ -0,0 +1,132 @@ +onEvent('recipes', (event) => { + if (global.isExpertMode == false) { + return; + } + const recipes = [ + { + result: { item: 'mekanism:basic_energy_cube' }, + pattern: ['ABA', 'CDC', 'EEE'], + key: { + A: { item: 'powah:capacitor_blazing' }, + B: { tag: 'industrialforegoing:machine_frame/simple' }, + C: { + type: 'forge:nbt', + item: 'immersiveengineering:graphite_electrode', + nbt: '{graphDmg:0}' + }, + D: { + type: 'pneumaticcraft:fluid', + fluid: 'mekanism:lithium', + amount: 1000 + }, + E: { tag: 'forge:ingots/signalum' } + }, + id: 'mekanism:energy_cube/basic' + }, + { + result: { item: 'mekanism:advanced_energy_cube' }, + pattern: ['ABA', 'CDC', 'EEE'], + key: { + A: { item: 'powah:capacitor_niotic' }, + B: { item: 'mekanism:basic_energy_cube' }, + C: { + type: 'forge:nbt', + item: 'immersiveengineering:graphite_electrode', + nbt: '{graphDmg:0}' + }, + D: { + type: 'pneumaticcraft:fluid', + fluid: 'mekanism:lithium', + amount: 1000 + }, + E: { tag: 'mekanism:alloys/infused' } + }, + id: 'mekanism:energy_cube/advanced' + }, + { + result: { item: 'mekanism:elite_energy_cube' }, + pattern: ['ABA', 'CDC', 'EEE'], + key: { + A: { item: 'powah:capacitor_spirited' }, + B: { item: 'mekanism:advanced_energy_cube' }, + C: { + type: 'forge:nbt', + item: 'immersiveengineering:graphite_electrode', + nbt: '{graphDmg:0}' + }, + D: { + type: 'pneumaticcraft:fluid', + fluid: 'mekanism:lithium', + amount: 1000 + }, + E: { tag: 'mekanism:alloys/reinforced' } + }, + id: 'mekanism:energy_cube/elite' + }, + { + result: { item: 'mekanism:ultimate_energy_cube' }, + pattern: ['ABA', 'CDC', 'EEE'], + key: { + A: { item: 'powah:capacitor_nitro' }, + B: { item: 'mekanism:elite_energy_cube' }, + C: { + type: 'forge:nbt', + item: 'immersiveengineering:graphite_electrode', + nbt: '{graphDmg:0}' + }, + D: { + type: 'pneumaticcraft:fluid', + fluid: 'mekanism:lithium', + amount: 1000 + }, + E: { tag: 'mekanism:alloys/atomic' } + }, + id: 'mekanism:energy_cube/ultimate' + }, + { + result: { item: 'mekanism:basic_induction_cell' }, + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: { item: 'powah:capacitor_blazing' }, + B: { item: 'immersiveengineering:coil_hv' }, + C: { item: 'mekanism:basic_energy_cube' } + }, + id: 'mekanism:induction/cell/basic' + }, + { + result: { item: 'mekanism:advanced_induction_cell' }, + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: { item: 'powah:capacitor_niotic' }, + B: { item: 'mekanism:basic_induction_cell' }, + C: { item: 'mekanism:advanced_energy_cube' } + }, + id: 'mekanism:induction/cell/advanced' + }, + { + result: { item: 'mekanism:elite_induction_cell' }, + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: { item: 'powah:capacitor_spirited' }, + B: { item: 'mekanism:advanced_induction_cell' }, + C: { item: 'mekanism:elite_energy_cube' } + }, + id: 'mekanism:induction/cell/elite' + }, + { + result: { item: 'mekanism:ultimate_induction_cell' }, + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: { item: 'powah:capacitor_nitro' }, + B: { item: 'mekanism:elite_induction_cell' }, + C: { item: 'mekanism:ultimate_energy_cube' } + }, + id: 'mekanism:induction/cell/ultimate' + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'mekanism:mek_data'; + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js index a2587946a5..fd7f242243 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js @@ -2,6 +2,7 @@ onEvent('recipes', (event) => { if (global.isExpertMode == false) { return; } + const id_prefix = 'enigmatica:expert/mekanism/metallurgic_infusing/'; const recipes = [ { output: 'mekanism:alloy_infused', @@ -9,6 +10,34 @@ onEvent('recipes', (event) => { infusionInput: 'mekanism:redstone', infusionAmount: 10, id: 'mekanism:metallurgic_infusing/alloy/infused' + }, + { + output: 'refinedstorage:stack_upgrade', + input: Item.of('4x refinedstorage:speed_upgrade'), + infusionInput: 'mekanism:redstone', + infusionAmount: 80, + id: 'refinedstorage:stack_upgrade' + }, + { + output: 'mekanismgenerators:reactor_glass', + input: 'mekanism:structural_glass', + infusionInput: 'mekanism:refined_obsidian', + infusionAmount: 320, + id: 'mekanismgenerators:reactor/glass' + }, + { + output: 'immersiveengineering:rockcutter', + input: 'immersiveengineering:sawblade', + infusionInput: 'mekanism:diamond', + infusionAmount: 80, + id: 'immersiveengineering:crafting/rockcutter' + }, + { + output: 'mekanism:ingot_refined_obsidian', + input: '#forge:ingots/osmium', + infusionInput: 'mekanism:refined_obsidian', + infusionAmount: 160, + id: 'mekanism:processing/refined_obsidian/ingot/from_dust' } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/reaction.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/reaction.js new file mode 100644 index 0000000000..deb6644b57 --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/reaction.js @@ -0,0 +1,34 @@ +onEvent('recipes', (event) => { + if (global.isExpertMode == false) { + return; + } + const id_prefix = 'enigmatica:expert/thermal/reaction'; + const recipes = [ + { + itemInput: { ingredient: { tag: 'forge:ingots/manyullyn', count: 2 } }, + fluidInput: { amount: 144, fluid: 'materialis:molten_shadow_steel' }, + gasInput: { amount: 1000, gas: 'mekanism:plutonium' }, + energyRequired: 1000, + duration: 300, + itemOutput: { item: 'mekanism:alloy_atomic', count: 3 }, + gasOutput: { gas: 'mekanism:spent_nuclear_waste', amount: 1000 }, + id: `${id_prefix}alloy_atomic` + } + ]; + + recipes.forEach((recipe) => { + let constructed_recipe = { + type: 'mekanism:reaction', + itemInput: recipe.itemInput, + fluidInput: recipe.fluidInput, + gasInput: recipe.gasInput, + duration: recipe.duration, + itemOutput: recipe.itemOutput, + gasOutput: recipe.gasOutput + }; + if (recipe.energyRequired) { + constructed_recipe.energyRequired = recipe.energyRequired; + } + event.custom(constructed_recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js index 290f4ee03e..ef32380cc4 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js @@ -16,13 +16,13 @@ onEvent('recipes', (event) => { } */ - const newRecipes = [ + const recipes = [ { output: 'mekanism:fuelwood_heater', pattern: ['BAB', 'CDC', 'BAB'], key: { A: '#forge:plates/copper', - B: 'engineersdecor:clinker_brick_block', + B: 'immersiveengineering:alloybrick', C: 'environmental:kiln', D: 'thermal:machine_frame' }, @@ -33,16 +33,709 @@ onEvent('recipes', (event) => { pattern: ['BEB', 'CDC', 'BAB'], key: { A: '#forge:circuits/advanced', - B: 'engineersdecor:clinker_brick_block', + B: 'immersiveengineering:blastbrick_reinforced', C: 'immersiveengineering:coil_hv', - D: 'mekanism:steel_casing', + D: '#industrialforegoing:machine_frame/simple', E: 'pneumaticcraft:heat_sink' }, id: 'mekanism:resistive_heater' + }, + { + output: 'mekanism:metallurgic_infuser', + pattern: ['ACA', 'BDB', 'AEA'], + key: { + A: '#forge:gears/osmium', + B: '#forge:circuits/basic', + C: 'rftoolspower:blazing_agitator', + D: 'thermal:machine_bottler', + E: 'rftoolspower:cell1' + }, + id: 'mekanism:metallurgic_infuser' + }, + { + output: 'mekanism:thermal_evaporation_controller', + pattern: ['AAA', 'BCD', 'AAA'], + key: { + A: 'mekanism:thermal_evaporation_block', + B: '#forge:circuits/elite', + C: '#industrialforegoing:machine_frame/advanced', + D: 'rftoolsbase:tablet' + }, + id: 'mekanism:thermal_evaporation/controller' + }, + { + output: Item.of('2x mekanism:thermal_evaporation_block'), + pattern: ['ADA', 'BCB', 'ADA'], + key: { + A: '#forge:plates/bronze', + B: 'pneumaticcraft:heat_pipe', + C: 'immersiveengineering:alloybrick', + D: '#mekanism:alloys/reinforced' + }, + id: 'mekanism:thermal_evaporation/block' + }, + { + output: 'mekanism:thermal_evaporation_valve', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: 'mekanism:thermal_evaporation_block', + B: 'create:copper_valve_handle', + C: 'create:fluid_pipe', + D: 'create:fluid_valve', + E: '#forge:circuits/elite' + }, + id: 'mekanism:thermal_evaporation/valve' + }, + { + output: Item.of('3x mekanism:structural_glass'), + pattern: ['ABC', 'BCB', 'CBA'], + key: { + A: '#mekanism:alloys/reinforced', + B: '#forge:plates/aluminum', + C: '#thermal:glass/hardened' + }, + id: 'mekanism:structural_glass' + }, + { + output: 'mekanism:steel_casing', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: '#forge:plates/steel', + B: '#mekanism:alloys/infused', + C: 'thermal:machine_frame' + }, + id: 'mekanism:steel_casing' + }, + { + output: 'mekanism:boiler_valve', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: 'mekanism:boiler_casing', + B: 'create:copper_valve_handle', + C: 'create:fluid_pipe', + D: 'create:fluid_valve', + E: '#forge:circuits/elite' + }, + id: 'mekanism:boiler_valve' + }, + { + output: Item.of('2x mekanism:boiler_casing'), + pattern: ['ADA', 'BCB', 'ADA'], + key: { + A: '#forge:plates/constantan', + B: 'pneumaticcraft:heat_pipe', + C: 'mekanism:steel_casing', + D: '#mekanism:alloys/reinforced' + }, + id: 'mekanism:boiler_casing' + }, + { + output: 'mekanism:superheating_element', + pattern: ['AAA', 'DCD', 'BDB'], + key: { + A: 'pneumaticcraft:heat_sink', + B: 'pneumaticcraft:heat_pipe', + C: 'mekanism:steel_casing', + D: 'immersiveengineering:coil_mv' + }, + id: 'mekanism:superheating_element' + }, + { + output: 'mekanism:pressure_disperser', + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'pneumaticcraft:advanced_pressure_tube', + B: 'mekanism:steel_casing' + }, + id: 'mekanism:pressure_disperser' + }, + { + output: 'mekanism:dynamic_valve', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: 'mekanism:dynamic_tank', + B: 'create:copper_valve_handle', + C: 'create:fluid_pipe', + D: 'create:fluid_valve', + E: 'pneumaticcraft:advanced_pcb' + }, + id: 'mekanism:dynamic_valve' + }, + { + output: Item.of('8x mekanism:dynamic_tank'), + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'immersiveengineering:sheetmetal_colored_black', + B: '#immersiveengineering:scaffoldings/aluminum' + }, + id: 'mekanism:dynamic_tank' + }, + { + output: Item.of('2x mekanismgenerators:turbine_casing'), + pattern: ['ADA', 'BCB', 'ADA'], + key: { + A: '#forge:plates/aluminum', + B: 'mekanism:hdpe_sheet', + C: 'mekanism:steel_casing', + D: '#mekanism:alloys/reinforced' + }, + id: 'mekanismgenerators:turbine/casing' + }, + { + output: 'mekanismgenerators:turbine_valve', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: 'mekanismgenerators:turbine_casing', + B: 'create:copper_valve_handle', + C: 'create:fluid_pipe', + D: 'create:fluid_valve', + E: '#forge:circuits/elite' + }, + id: 'mekanismgenerators:turbine/valve' + }, + { + output: Item.of('2x mekanismgenerators:turbine_vent'), + pattern: ['AAA', 'BCB', 'AAA'], + key: { + A: 'mekanismgenerators:turbine_casing', + B: 'create:fluid_pipe', + C: 'engineersdecor:straight_pipe_valve' + }, + id: 'mekanismgenerators:turbine/vent' + }, + { + output: 'mekanismgenerators:saturating_condenser', + pattern: ['BAB', 'BCB', 'BBB'], + key: { + A: 'pneumaticcraft:heat_sink', + B: 'create:fluid_pipe', + C: 'mekanism:steel_casing' + }, + id: 'mekanismgenerators:saturating_condenser' + }, + { + output: 'mekanismgenerators:electromagnetic_coil', + pattern: ['CAC', 'ABA', 'CAC'], + key: { + A: 'immersiveengineering:coil_lv', + B: '#industrialforegoing:machine_frame/supreme', + C: 'mekanism:basic_induction_cell' + }, + id: 'mekanismgenerators:electromagnetic_coil' + }, + { + output: 'mekanismgenerators:fission_fuel_assembly', + pattern: ['ABA', 'ACA', 'ABA'], + key: { + A: '#forge:rods/cobalt', + B: 'mekanism:elite_pressurized_tube', + C: 'thermal:machine_frame' + }, + id: 'mekanismgenerators:fission_reactor/fuel_assembly' + }, + { + output: 'mekanismgenerators:control_rod_assembly', + pattern: ['DCD', 'EFE', 'ABA'], + key: { + A: '#forge:rods/cobalt', + B: 'mekanism:elite_pressurized_tube', + C: 'thermal:machine_frame', + D: 'thermal:redstone_servo', + E: '#forge:gears/cobalt', + F: '#forge:circuits/elite' + }, + id: 'mekanismgenerators:fission_reactor/control_rod_assembly' + }, + { + output: Item.of('2x mekanism:sps_port'), + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: 'mekanism:sps_casing', + B: 'mekanism:ultimate_universal_cable', + C: 'mekanism:ultimate_pressurized_tube', + D: '#forge:circuits/ultimate' + }, + id: 'mekanism:sps_port' + }, + { + output: 'mekanismgenerators:fission_reactor_port', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: 'mekanismgenerators:fission_reactor_casing', + B: 'create:copper_valve_handle', + C: 'create:fluid_pipe', + D: 'create:fluid_valve', + E: '#forge:circuits/elite' + }, + id: 'mekanismgenerators:fission_reactor/port' + }, + { + output: 'mekanism:laser', + pattern: [' A ', 'BCB', 'DED'], + key: { + A: 'industrialforegoing:laser_lens14', + B: '#mekanism:alloys/infused', + C: '#forge:gems/nitro', + D: 'mekanism:advanced_induction_cell', + E: '#industrialforegoing:machine_frame/supreme' + }, + id: 'mekanism:laser' + }, + { + output: Item.of('2x mekanism:induction_port'), + pattern: ['AAA', 'BCB', 'AAA'], + key: { + A: 'mekanism:induction_casing', + B: '#forge:circuits/elite', + C: 'rftoolsbase:tablet' + }, + id: 'mekanism:induction/port' + }, + { + output: 'mekanism:electrolytic_separator', + pattern: ['ABA', 'CDC', 'ACA'], + key: { + A: '#forge:gears/osmium', + B: 'mekanism:electrolytic_core', + C: 'thermal:fluid_cell', + D: 'thermal:machine_frame' + }, + id: 'mekanism:electrolytic_separator' + }, + { + output: 'mekanism:electrolytic_core', + pattern: ['ABA', 'CBD', 'ABA'], + key: { + A: 'immersiveengineering:wirecoil_copper', + B: 'thermal:diving_fabric', + C: '#forge:plates/zinc', + D: '#forge:plates/aluminum' + }, + id: 'mekanism:electrolytic_core' + }, + { + output: 'mekanism:jetpack', + pattern: ['ABA', 'CDC', 'E E'], + key: { + A: '#forge:plates/bronze', + B: 'pneumaticcraft:advanced_pcb', + C: 'create:copper_backtank', + D: 'thermal:hazmat_chestplate', + E: 'immersiveengineering:toolupgrade_chemthrower_focus' + }, + id: 'mekanism:jetpack' + }, + { + output: 'mekanism:jetpack_armored', + pattern: ['A A', 'BCB', ' D '], + key: { + A: '#forge:gears/aluminum', + B: '#forge:plates/signalum', + C: ['mekanismtools:steel_chestplate', 'immersiveengineering:armor_steel_chest'], + D: 'mekanism:jetpack' + }, + id: 'mekanism:jetpack_armored' + }, + { + output: 'mekanismgenerators:solar_panel', + pattern: ['AAA', 'AAA', 'BBB'], + key: { + A: 'quark:blue_framed_glass_pane', + B: 'powah:thermoelectric_plate' + }, + id: 'mekanismgenerators:solar_panel' + }, + { + output: 'mekanismgenerators:solar_generator', + pattern: ['ABA', 'ACA', ' D '], + key: { + A: 'mekanismgenerators:solar_panel', + B: 'pneumaticcraft:advanced_pcb', + C: 'thermal:redstone_servo', + D: 'engineersdecor:thick_steel_pole_head' + }, + id: 'mekanismgenerators:generator/solar' + }, + { + output: 'mekanismgenerators:advanced_solar_generator', + pattern: ['ACA', 'ABA', ' D '], + key: { + A: 'mekanismgenerators:solar_generator', + B: 'engineersdecor:thick_steel_pole', + C: 'thermal:redstone_servo', + D: 'engineersdecor:thick_steel_pole_head' + }, + id: 'mekanismgenerators:generator/advanced_solar' + }, + { + output: Item.of('2x mekanismgenerators:fusion_reactor_port'), + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: 'mekanismgenerators:fusion_reactor_frame', + B: 'mekanism:ultimate_universal_cable', + C: 'mekanism:ultimate_pressurized_tube', + D: '#forge:circuits/ultimate' + }, + id: 'mekanismgenerators:reactor/port' + }, + { + output: 'mekanism:laser_amplifier', + pattern: ['ABA', 'BCD', 'ABA'], + key: { + A: '#mekanism:alloys/infused', + B: 'mekanismgenerators:laser_focus_matrix', + C: 'mekanism:basic_induction_cell', + D: 'industrialforegoing:laser_lens14' + }, + id: 'mekanism:laser_amplifier' + }, + { + output: 'mekanismgenerators:laser_focus_matrix', + pattern: [' B ', 'BAB', ' B '], + key: { + A: 'mekanismgenerators:reactor_glass', + B: 'industrialforegoing:laser_lens14' + }, + id: 'mekanismgenerators:laser_focus_matrix' + }, + { + output: 'mekanism:rotary_condensentrator', + pattern: ['ABA', 'CDE', 'FGF'], + key: { + A: 'immersiveengineering:steel_wallmount', + B: 'immersiveengineering:turntable', + C: 'mekanism:basic_chemical_tank', + D: '#industrialforegoing:machine_frame/pity', + E: 'mekanism:basic_fluid_tank', + F: 'pneumaticcraft:advanced_pcb', + G: 'thermal:rf_coil' + }, + id: 'mekanism:rotary_condensentrator' + }, + { + output: 'mekanism:enrichment_chamber', + pattern: ['ABA', 'CDC', 'EFE'], + key: { + A: Item.of('immersiveengineering:graphite_electrode', '{graphDmg:0}'), + B: 'minecraft:cauldron', + C: 'mekanism:basic_induction_cell', + D: '#industrialforegoing:machine_frame/simple', + E: '#forge:circuits/basic', + F: 'rftoolspower:cell1' + }, + id: 'mekanism:enrichment_chamber' + }, + { + output: 'mekanism:crusher', + pattern: ['ABA', 'CDC', 'EFE'], + key: { + A: '#forge:gears/osmium', + B: 'engineersdecor:factory_hopper', + C: 'create:filter', + D: '#industrialforegoing:machine_frame/pity', + E: 'pneumaticcraft:advanced_pcb', + F: 'thermal:rf_coil' + }, + id: 'mekanism:crusher' + }, + { + output: 'mekanism:energized_smelter', + pattern: ['ABA', 'CDC', 'EFE'], + key: { + A: 'immersiveengineering:blastbrick_reinforced', + B: 'minecraft:cauldron', + C: 'immersiveengineering:coil_hv', + D: '#industrialforegoing:machine_frame/simple', + E: '#forge:circuits/basic', + F: 'rftoolspower:cell1' + }, + id: 'mekanism:energized_smelter' + }, + { + output: 'mekanism:precision_sawmill', + pattern: ['ABA', 'CDC', 'EFE'], + key: { + A: 'create:rotation_speed_controller', + B: 'immersiveengineering:rockcutter', + C: 'immersiveengineering:heavy_engineering', + D: '#industrialforegoing:machine_frame/simple', + E: '#forge:circuits/basic', + F: 'rftoolspower:cell1' + }, + id: 'mekanism:precision_sawmill' + }, + { + output: 'mekanism:nutritional_liquifier', + pattern: ['ABA', 'CDC', 'EFE'], + key: { + A: 'immersiveengineering:steel_wallmount', + B: 'immersiveengineering:turntable', + C: 'mekanism:advanced_chemical_tank', + D: '#industrialforegoing:machine_frame/simple', + E: '#forge:circuits/basic', + F: 'rftoolspower:cell1' + }, + id: 'mekanism:nutritional_liquifier' + }, + { + output: 'mekanism:electric_pump', + pattern: ['ABC', 'ADC', 'AEC'], + key: { + A: 'mekanism:dynamic_tank', + B: 'create:mechanical_pump', + C: 'create:fluid_pipe', + D: 'supplementaries:cog_block', + E: 'immersiveengineering:turntable' + }, + id: 'mekanism:electric_pump' + }, + { + output: 'mekanism:fluidic_plenisher', + pattern: ['AEC', 'ADC', 'ABC'], + key: { + A: 'mekanism:dynamic_tank', + B: 'create:mechanical_pump', + C: 'create:fluid_pipe', + D: 'supplementaries:cog_block', + E: 'immersiveengineering:turntable' + }, + id: 'mekanism:fluidic_plenisher' + }, + { + output: 'mekanism:purification_chamber', + pattern: ['AAA', 'BDC', 'EFE'], + key: { + A: 'architects_palette:abyssaline_lamp', + B: 'glassential:glass_dark', + C: 'mekanism:advanced_chemical_tank', + D: '#industrialforegoing:machine_frame/advanced', + E: '#forge:circuits/advanced', + F: 'rftoolspower:cell2' + }, + id: 'mekanism:purification_chamber' + }, + { + output: 'mekanism:pressurized_reaction_chamber', + pattern: ['ABA', 'CDC', 'EFE'], + key: { + A: '#thermal:glass/hardened', + B: 'mekanism:basic_fluid_tank', + C: 'mekanism:basic_chemical_tank', + D: '#industrialforegoing:machine_frame/pity', + E: 'pneumaticcraft:advanced_pcb', + F: 'thermal:rf_coil' + }, + id: 'mekanism:pressurized_reaction_chamber' + }, + { + output: 'mekanism:chemical_injection_chamber', + pattern: ['ABB', 'CDG', 'EFE'], + key: { + A: 'immersiveengineering:toolupgrade_chemthrower_focus', + B: 'mekanism:advanced_pressurized_tube', + C: 'create:basin', + D: '#industrialforegoing:machine_frame/advanced', + E: '#forge:circuits/advanced', + F: 'rftoolspower:cell2', + G: 'mekanism:advanced_chemical_tank' + }, + id: 'mekanism:chemical_injection_chamber' + }, + { + output: 'mekanism:chemical_crystallizer', + pattern: ['ABC', 'DEF', 'GHG'], + key: { + A: 'mekanism:advanced_pressurized_tube', + B: 'mekanismgenerators:saturating_condenser', + C: 'create:basin', + D: 'mekanism:advanced_chemical_tank', + E: '#industrialforegoing:machine_frame/advanced', + F: 'thermal:machine_chiller', + G: '#forge:circuits/advanced', + H: 'rftoolspower:cell2' + }, + id: 'mekanism:chemical_crystallizer' + }, + { + output: 'mekanism:isotopic_centrifuge', + pattern: ['ABA', 'CDC', 'EFE'], + key: { + A: 'resourcefulbees:elite_centrifuge_casing', + B: 'mekanism:elite_chemical_tank', + C: 'mekanismgenerators:reactor_glass', + D: 'resourcefulbees:elite_centrifuge_controller', + E: '#forge:circuits/elite', + F: 'rftoolspower:cell3' + }, + id: 'mekanism:isotopic_centrifuge' + }, + { + output: 'mekanism:chemical_oxidizer', + pattern: ['ABC', 'DEC', 'FGF'], + key: { + A: 'mekanism:elite_mechanical_pipe', + B: 'mekanism:electrolytic_separator', + C: 'mekanism:elite_pressurized_tube', + D: 'cookingforblockheads:sink', + E: 'mekanism:chemical_injection_chamber', + F: '#forge:circuits/elite', + G: 'rftoolspower:cell3' + }, + id: 'mekanism:chemical_oxidizer' + }, + { + output: 'mekanism:chemical_infuser', + pattern: ['ABA', 'BCB', 'DED'], + key: { + A: 'rftoolspower:blazing_agitator', + B: 'mekanism:elite_chemical_tank', + C: '#industrialforegoing:machine_frame/advanced', + D: '#forge:circuits/elite', + E: 'rftoolspower:cell3' + }, + id: 'mekanism:chemical_infuser' + }, + { + output: 'mekanism:chemical_dissolution_chamber', + pattern: ['ABB', 'CDB', 'EFE'], + key: { + A: 'mekanism:elite_chemical_tank', + B: 'mekanism:elite_pressurized_tube', + C: 'industrialforegoing:dissolution_chamber', + D: '#industrialforegoing:machine_frame/advanced', + E: '#forge:circuits/elite', + F: 'rftoolspower:cell3' + }, + id: 'mekanism:chemical_dissolution_chamber' + }, + { + output: 'mekanism:chemical_washer', + pattern: ['ABB', 'CDA', 'EFE'], + key: { + A: 'mekanism:ultimate_chemical_tank', + B: 'mekanism:ultimate_pressurized_tube', + C: 'mekanism:ultimate_fluid_tank', + D: '#industrialforegoing:machine_frame/supreme', + E: '#forge:circuits/ultimate', + F: 'mekanism:ultimate_induction_provider' + }, + id: 'mekanism:chemical_washer' + }, + { + output: 'mekanism:antiprotonic_nucleosynthesizer', + pattern: ['ABA', 'CDC', 'EBE'], + key: { + A: '#forge:pellets/antimatter', + B: '#forge:circuits/ultimate', + C: 'mekanism:supercharged_coil', + D: 'mekanism:sps_casing', + E: 'mekanism:ultimate_induction_provider' + }, + id: 'mekanism:antiprotonic_nucleosynthesizer' + }, + { + output: 'mekanismgenerators:heat_generator', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'immersiveengineering:blastbrick_reinforced', + B: 'powah:thermoelectric_plate', + C: 'minecraft:blast_furnace' + }, + id: 'mekanismgenerators:generator/heat' + }, + { + output: 'mekanismgenerators:gas_burning_generator', + pattern: ['ABA', 'CDC', 'EFE'], + key: { + A: '#forge:gears/compressed_iron', + B: 'mekanism:basic_chemical_tank', + C: 'pneumaticcraft:turbine_rotor', + D: '#industrialforegoing:machine_frame/pity', + E: 'immersiveengineering:coil_lv', + F: 'thermal:rf_coil' + }, + id: 'mekanismgenerators:generator/gas_burning' + }, + { + output: 'mekanismgenerators:bio_generator', + pattern: ['ABA', 'CDC', 'EFE'], + key: { + A: '#forge:gears/invar', + B: 'mekanism:basic_fluid_tank', + C: 'create:propeller', + D: '#industrialforegoing:machine_frame/pity', + E: 'immersiveengineering:coil_lv', + F: 'thermal:rf_coil' + }, + id: 'mekanismgenerators:generator/bio' + }, + { + output: 'mekanism:free_runners', + pattern: ['ABA', 'CDC', 'EFE'], + key: { + A: 'create:precision_mechanism', + B: 'immersiveengineering:capacitor_lv', + C: '#forge:gears/bronze', + D: 'immersiveengineering:toolupgrade_drill_lube', + E: 'immersiveengineering:component_steel', + F: 'immersiveengineering:armor_faraday_feet' + }, + id: 'mekanism:free_runners' + }, + { + output: 'mekanism:electric_bow', + pattern: [' BC', 'A C', ' BC'], + key: { + A: 'powah:dielectric_rod', + B: 'powah:capacitor_hardened', + C: '#forge:wires/aluminum' + }, + id: 'mekanism:electric_bow' + }, + { + output: 'mekanism:configurator', + pattern: [' A', ' B ', 'C '], + key: { + A: '#forge:rods/lapis', + B: 'thermal:rf_coil', + C: '#forge:rods/steel' + }, + id: 'mekanism:configurator' + }, + { + output: 'mekanism:chargepad', + pattern: ['AAA', 'BCB'], + key: { + A: 'minecraft:polished_blackstone_pressure_plate', + B: '#forge:ingots/steel', + C: 'thermal:rf_coil' + }, + id: 'mekanism:chargepad' + }, + { + output: 'mekanism:network_reader', + pattern: [' B ', 'ACA', ' B '], + key: { + A: '#forge:alloys/advanced', + B: '#forge:ingots/steel', + C: 'thermal:rf_coil' + }, + id: 'mekanism:network_reader' + }, + { + output: 'mekanism:portable_teleporter', + pattern: ['ABA', 'CDC'], + key: { + A: 'thermal:rf_coil', + B: 'mekanism:teleportation_core', + C: '#forge:plates/steel', + D: 'rftoolsbase:tablet' + }, + id: 'mekanism:portable_teleporter' } ]; - newRecipes.forEach((recipe) => { + recipes.forEach((recipe) => { event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); }); }); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/minecraft/smithing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/minecraft/smithing.js index 311f81c87b..2c863cb214 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/minecraft/smithing.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/minecraft/smithing.js @@ -8,12 +8,15 @@ onEvent('recipes', (event) => { input2: '#forge:ingots/arcane_gold', output: 'eidolon:basic_amulet', id: 'eidolon:basic_amulet' + }, + { + input1: '#forge:ingots/aeternium', + input2: 'betterendforge:leather_wrapped_stick', + output: 'betterendforge:aeternium_sword_handle', + id: 'betterendforge:aeternium_sword_handle_smithing' } ]; recipes.forEach((recipe) => { - const re = event.smithing(recipe.output, recipe.input1, recipe.input2); - if (recipe.id) { - re.id(recipe.id); - } + event.smithing(recipe.output, recipe.input1, recipe.input2).id(recipe.id); }); }); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mininggadgets/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mininggadgets/shaped.js new file mode 100644 index 0000000000..9e64b5adc5 --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mininggadgets/shaped.js @@ -0,0 +1,276 @@ +onEvent('recipes', (event) => { + if (global.isExpertMode == false) { + return; + } + + /* + , + { + output: '', + pattern: ['', '', ''], + key: { + A: '' + }, + id: '' + } + */ + + const recipes = [ + { + output: 'mininggadgets:upgrade_silk', + pattern: ['ABA', 'CDC', 'ACA'], + key: { + A: 'tconstruct:silky_cloth', + B: '#forge:circuits/basic', + C: '#forge:alloys/elite', + D: 'mekanism:module_base' + }, + id: 'mininggadgets:upgrade_silk' + }, + { + output: 'mininggadgets:upgrade_void_junk', + pattern: ['ABA', 'CDC', 'ACA'], + key: { + A: 'trashcans:item_trash_can', + B: '#forge:circuits/basic', + C: '#forge:ingots/andesite_alloy', + D: 'mekanism:module_base' + }, + id: 'mininggadgets:upgrade_void_junk' + }, + { + output: 'mininggadgets:upgrade_magnet', + pattern: ['ABA', 'ADA', 'ACA'], + key: { + A: 'immersiveengineering:coil_lv', + B: '#forge:circuits/basic', + C: 'thermal:flux_magnet', + D: 'mekanism:module_base' + }, + id: 'mininggadgets:upgrade_magnet' + }, + { + output: 'mininggadgets:upgrade_three_by_three', + pattern: ['ABA', 'CDC', 'ACA'], + key: { + A: 'immersiveengineering:insulating_glass', + B: '#forge:circuits/basic', + C: 'mekanismgenerators:laser_focus_matrix', + D: 'mekanism:module_base' + }, + id: 'mininggadgets:upgrade_three_by_three' + }, + { + output: 'mininggadgets:upgrade_light_placer', + pattern: ['ABA', 'CDC', 'ACA'], + key: { + A: '#forge:gears/lumium', + B: '#forge:circuits/basic', + C: 'thermal:lumium_glass', + D: 'mekanism:module_base' + }, + id: 'mininggadgets:upgrade_light_placer' + }, + { + output: 'mininggadgets:upgrade_light_placer', + pattern: ['ABA', 'CDC', 'ACA'], + key: { + A: '#forge:gears/lumium', + B: '#forge:circuits/basic', + C: 'thermal:lumium_glass', + D: 'mekanism:module_base' + }, + id: 'mininggadgets:upgrade_light_placer' + }, + { + output: 'mininggadgets:upgrade_freezing', + pattern: ['ABA', 'CDC', 'ACA'], + key: { + A: 'cookingforblockheads:preservation_chamber', + B: '#forge:circuits/basic', + C: 'powah:dry_ice', + D: 'mekanism:module_base' + }, + id: 'mininggadgets:upgrade_freezing' + }, + { + output: 'mininggadgets:upgrade_fortune_1', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: '#forge:storage_blocks/emerald', + B: '#forge:circuits/basic', + C: 'create:polished_rose_quartz', + D: 'mekanism:module_base', + E: 'meetyourfight:fortunes_favor' + }, + id: 'mininggadgets:upgrade_fortune_1' + }, + { + output: 'mininggadgets:upgrade_fortune_2', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: '#forge:storage_blocks/gold', + B: '#forge:circuits/advanced', + C: 'create:polished_rose_quartz', + D: 'mininggadgets:upgrade_fortune_1', + E: 'atum:ptah_godshard' + }, + id: 'mininggadgets:upgrade_fortune_2' + }, + { + output: 'mininggadgets:upgrade_fortune_3', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: '#forge:storage_blocks/rose_gold', + B: '#forge:circuits/elite', + C: 'create:polished_rose_quartz', + D: 'mininggadgets:upgrade_fortune_2', + E: 'atum:fish_jeweled' + }, + id: 'mininggadgets:upgrade_fortune_3' + }, + + { + output: 'mininggadgets:upgrade_range_1', + pattern: ['ABA', 'ADA', 'ACA'], + key: { + A: 'immersiveengineering:coil_lv', + B: '#forge:circuits/basic', + C: 'mekanism:laser_amplifier', + D: 'mekanism:module_base' + }, + id: 'mininggadgets:upgrade_range_1' + }, + { + output: 'mininggadgets:upgrade_range_2', + pattern: ['ABA', 'ADA', 'ACA'], + key: { + A: 'immersiveengineering:coil_mv', + B: '#forge:circuits/advanced', + C: 'mekanism:laser_amplifier', + D: 'mininggadgets:upgrade_range_1' + }, + id: 'mininggadgets:upgrade_range_2' + }, + { + output: 'mininggadgets:upgrade_range_3', + pattern: ['ABA', 'ADA', 'ACA'], + key: { + A: 'immersiveengineering:coil_hv', + B: '#forge:circuits/elite', + C: 'mekanism:laser_amplifier', + D: 'mininggadgets:upgrade_range_2' + }, + id: 'mininggadgets:upgrade_range_3' + }, + + { + output: 'mininggadgets:upgrade_battery_1', + pattern: ['ABA', 'CDC', 'ACA'], + key: { + A: 'immersiveengineering:insulating_glass', + B: '#forge:circuits/basic', + C: 'mekanism:basic_energy_cube', + D: 'mekanism:module_base' + }, + id: 'mininggadgets:upgrade_battery_1' + }, + { + output: 'mininggadgets:upgrade_battery_2', + pattern: ['ABA', 'CDC', 'ACA'], + key: { + A: 'immersiveengineering:insulating_glass', + B: '#forge:circuits/advanced', + C: 'mekanism:advanced_energy_cube', + D: 'mininggadgets:upgrade_battery_1' + }, + id: 'mininggadgets:upgrade_battery_2' + }, + { + output: 'mininggadgets:upgrade_battery_3', + pattern: ['ABA', 'CDC', 'ACA'], + key: { + A: 'immersiveengineering:insulating_glass', + B: '#forge:circuits/elite', + C: 'mekanism:elite_energy_cube', + D: 'mininggadgets:upgrade_battery_2' + }, + id: 'mininggadgets:upgrade_battery_3' + }, + + { + output: 'mininggadgets:upgrade_efficiency_1', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: 'mekanism:basic_thermodynamic_conductor', + B: '#forge:circuits/basic', + C: 'immersiveengineering:toolupgrade_railgun_capacitors', + D: 'mekanism:module_base', + E: 'powah:energizing_rod_hardened' + }, + id: 'mininggadgets:upgrade_efficiency_1' + }, + { + output: 'mininggadgets:upgrade_efficiency_2', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: 'mekanism:advanced_thermodynamic_conductor', + B: '#forge:circuits/advanced', + C: 'immersiveengineering:toolupgrade_railgun_capacitors', + D: 'mininggadgets:upgrade_efficiency_1', + E: 'powah:energizing_rod_blazing' + }, + id: 'mininggadgets:upgrade_efficiency_2' + }, + { + output: 'mininggadgets:upgrade_efficiency_3', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: 'mekanism:advanced_thermodynamic_conductor', + B: '#forge:circuits/advanced', + C: 'immersiveengineering:toolupgrade_railgun_capacitors', + D: 'mininggadgets:upgrade_efficiency_2', + E: 'powah:energizing_rod_niotic' + }, + id: 'mininggadgets:upgrade_efficiency_3' + }, + { + output: 'mininggadgets:upgrade_efficiency_4', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: 'mekanism:elite_thermodynamic_conductor', + B: '#forge:circuits/elite', + C: 'immersiveengineering:toolupgrade_railgun_capacitors', + D: 'mininggadgets:upgrade_efficiency_3', + E: 'powah:energizing_rod_spirited' + }, + id: 'mininggadgets:upgrade_efficiency_4' + }, + { + output: 'mininggadgets:upgrade_efficiency_5', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: 'mekanism:elite_thermodynamic_conductor', + B: '#forge:circuits/elite', + C: 'immersiveengineering:toolupgrade_railgun_capacitors', + D: 'mininggadgets:upgrade_efficiency_4', + E: 'powah:energizing_rod_nitro' + }, + id: 'mininggadgets:upgrade_efficiency_5' + }, + { + output: 'mininggadgets:modificationtable', + pattern: ['BAB', 'BCB'], + key: { + A: 'rftoolsbase:tablet', + B: 'mekanism:hdpe_sheet', + C: 'thermal:tinker_bench' + }, + id: 'mininggadgets:modificationtable' + } + ]; + + recipes.forEach((recipe) => { + event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js index 317a324d34..135160d157 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js @@ -63,8 +63,8 @@ onEvent('recipes', (event) => { pentacle_id: 'occultism:summon_wild_afrit', duration: 6, entity_to_sacrifice: { - tag: 'forge:cows', - display_name: 'ritual.occultism.sacrifice.cows' + tag: 'enigmatica:camels', + display_name: 'ritual.occultism.sacrifice.camels' }, entity_to_summon: 'occultism:afrit_wild', ritual_dummy: { item: 'occultism:ritual_dummy/summon_wild_afrit' }, @@ -72,7 +72,7 @@ onEvent('recipes', (event) => { { item: 'eidolon:gold_inlay' }, { tag: 'botania:runes/fire' }, { item: 'eidolon:crimson_essence' }, - { tag: 'botania:runes/wrath' }, + { tag: 'botania:runes/fire' }, { item: 'ars_nouveau:red_archwood_wood' }, { item: 'ars_nouveau:red_archwood_wood' }, { item: 'ars_nouveau:red_archwood_wood' }, @@ -434,7 +434,7 @@ onEvent('recipes', (event) => { pentacle_id: 'occultism:possess_foliot', duration: 3, entity_to_sacrifice: { - tag: 'occultism:wild_hunt_sacrifices', + tag: 'occultism:humans', display_name: 'ritual.occultism.sacrifice.humans' }, entity_to_summon: 'occultism:greedy_familiar', @@ -672,7 +672,7 @@ onEvent('recipes', (event) => { pentacle_id: 'occultism:summon_wild_afrit', duration: 6, entity_to_sacrifice: { - tag: 'occultism:wild_hunt_sacrifices', + tag: 'occultism:humans', display_name: 'ritual.occultism.sacrifice.humans' }, entity_to_summon: 'atum:pharaoh', @@ -695,7 +695,7 @@ onEvent('recipes', (event) => { activation_item: { item: 'occultism:book_of_binding_bound_foliot' }, pentacle_id: 'occultism:craft_foliot', duration: 10, - ritual_dummy: { item: 'kubejs:craft_spirit_heat_exchanger' }, + ritual_dummy: { item: 'kubejs:craft_spirit_entropic_gateway' }, ingredients: [ { item: 'ars_nouveau:void_jar' }, { item: 'atum:shu_godshard' }, @@ -706,8 +706,8 @@ onEvent('recipes', (event) => { { tag: 'botania:runes/water' }, { tag: 'botania:runes/water' } ], - result: { item: 'kubejs:spirit_heat_exchanger' }, - id: `${id_prefix}spirit_heat_exchanger` + result: { item: 'kubejs:spirit_entropic_gateway' }, + id: `${id_prefix}spirit_entropic_gateway` }, { ritual_type: 'occultism:craft_with_spirit_name', @@ -903,6 +903,31 @@ onEvent('recipes', (event) => { ], result: { item: 'occultism:jei_dummy/none' }, id: `${id_prefix}pink_wither` + }, + { + ritual_type: 'occultism:craft_with_spirit_name', + activation_item: { item: 'occultism:book_of_binding_bound_foliot' }, + pentacle_id: 'occultism:craft_foliot', + duration: 12, + ritual_dummy: { item: 'kubejs:craft_robit' }, + ingredients: [ + { tag: 'industrialforegoing:machine_frame/pity' }, + { item: 'create:belt_connector' }, + { tag: 'forge:dusts/salt' }, + { item: 'create:belt_connector' }, + + { tag: 'forge:circuits/basic' }, + { tag: 'forge:gears/osmium' }, + { item: 'create:encased_chain_drive' }, + { tag: 'forge:gears/osmium' }, + + { tag: 'forge:circuits/basic' }, + { tag: 'forge:gears/osmium' }, + { item: 'create:encased_chain_drive' }, + { tag: 'forge:gears/osmium' } + ], + result: { item: 'mekanism:robit' }, + id: 'mekanism:robit' } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/assembly.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/assembly.js index 1e172d4bab..34623a4ada 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/assembly.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/assembly.js @@ -36,7 +36,7 @@ onEvent('recipes', (event) => { }, { input: { item: 'kubejs:basic_circuit_assembly', count: 1 }, - output: { item: 'mekanism:basic_control_circuit', count: 3 }, + output: { item: 'mekanism:basic_control_circuit', count: 2 }, program: 'laser', id: 'mekanism:control_circuit/basic' }, @@ -45,6 +45,18 @@ onEvent('recipes', (event) => { output: { item: 'occultism:lenses', count: 3 }, program: 'laser', id: 'occultism:crafting/lenses' + }, + { + input: { item: 'kubejs:basic_memory_package', count: 1 }, + output: { item: 'kubejs:basic_memory_assembly', count: 1 }, + program: 'drill', + id: `${id_prefix}basic_memory_assembly` + }, + { + input: { item: 'kubejs:basic_memory_assembly', count: 1 }, + output: { item: 'kubejs:memory_basic_empty', count: 2 }, + program: 'laser', + id: `${id_prefix}memory_basic_empty` } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/pressure_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/pressure_chamber.js index da4343e7a2..ae93e9ac90 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/pressure_chamber.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/pressure_chamber.js @@ -194,6 +194,42 @@ onEvent('recipes', (event) => { pressure: 2.0, results: [{ item: 'integrateddynamics:variable_transformer_input', count: 1 }], id: `${id_prefix}variable_transformer_input` + }, + { + inputs: [ + { item: 'kubejs:memory_basic_empty', count: 2 }, + { item: 'fluxnetworks:flux_dust', count: 1 } + ], + pressure: 4.0, + results: [{ item: 'kubejs:memory_advanced_empty', count: 1 }], + id: `${id_prefix}memory_advanced_empty` + }, + { + inputs: [ + { item: 'kubejs:memory_advanced_empty', count: 2 }, + { item: 'fluxnetworks:flux_dust', count: 1 } + ], + pressure: 4.0, + results: [{ item: 'kubejs:memory_elite_empty', count: 1 }], + id: `${id_prefix}memory_elite_empty` + }, + { + inputs: [ + { item: 'kubejs:memory_elite_empty', count: 2 }, + { item: 'fluxnetworks:flux_dust', count: 1 } + ], + pressure: 4.0, + results: [{ item: 'kubejs:memory_ultimate_empty', count: 1 }], + id: `${id_prefix}memory_ultimate_empty` + }, + { + inputs: [ + { tag: 'mekanism:alloys/reinforced', count: 3 }, + { item: 'pneumaticcraft:turbine_rotor', count: 1 } + ], + pressure: 4.0, + results: [{ item: 'mekanismgenerators:turbine_blade', count: 1 }], + id: 'mekanismgenerators:turbine/blade' } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/refinery.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/refinery.js new file mode 100644 index 0000000000..c00004fecb --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/refinery.js @@ -0,0 +1,31 @@ +onEvent('recipes', (event) => { + if (global.isExpertMode == false) { + return; + } + const id_prefix = 'enigmatica:expert/pneumaticcraft/refinery/'; + const recipes = [ + { + input: { type: 'pneumaticcraft:fluid', fluid: 'minecraft:water', amount: 100 }, + temperature: { min_temp: 373 }, + results: [ + { fluid: 'mekanism:brine', amount: 8 }, + { fluid: 'mekanism:brine', amount: 2 } + ], + id: `${id_prefix}brine` + }, + { + input: { type: 'pneumaticcraft:fluid', fluid: 'mekanism:brine', amount: 100 }, + temperature: { min_temp: 373 }, + results: [ + { fluid: 'mekanism:lithium', amount: 8 }, + { fluid: 'mekanism:lithium', amount: 2 } + ], + id: `${id_prefix}lithium` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'pneumaticcraft:refinery'; + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js index 58fd926918..20f572f188 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js @@ -220,7 +220,7 @@ onEvent('recipes', (event) => { key: { A: '#forge:ingots/compressed_iron', B: 'pneumaticcraft:pressure_tube', - C: '#forge:plates/copper', + C: 'powah:thermoelectric_plate', D: 'thermal:machine_frame' }, id: 'pneumaticcraft:thermal_compressor' @@ -372,6 +372,16 @@ onEvent('recipes', (event) => { G: 'kubejs:dimensional_storage_crystal' }, id: 'pneumaticcraft:vacuum_trap' + }, + { + output: 'pneumaticcraft:spawner_core_shell', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'kubejs:dimensional_storage_crystal', + B: 'pneumaticcraft:pressure_chamber_glass', + C: 'naturesaura:calling_spirit' + }, + id: 'pneumaticcraft:spawner_core_shell' } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/thermo_plant.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/thermo_plant.js index 1ca9f1fab4..a55e7c3c75 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/thermo_plant.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/thermo_plant.js @@ -79,7 +79,6 @@ onEvent('recipes', (event) => { id: 'pneumaticcraft:thermo_plant/upgrade_matrix' }, { - type: 'pneumaticcraft:thermo_plant', item_input: { item: 'atum:crystal_glass' }, item_output: { item: 'integratedterminals:menril_glass' }, fluid_input: { type: 'pneumaticcraft:fluid', fluid: 'integrateddynamics:menril_resin', amount: 1000 }, @@ -90,7 +89,6 @@ onEvent('recipes', (event) => { id: `${id_prefix}menril_glass` }, { - type: 'pneumaticcraft:thermo_plant', item_input: { item: 'atum:crystal_glass' }, item_output: { item: 'integratedterminals:chorus_glass' }, fluid_input: { type: 'pneumaticcraft:fluid', fluid: 'integrateddynamics:liquid_chorus', amount: 1000 }, @@ -101,7 +99,6 @@ onEvent('recipes', (event) => { id: `${id_prefix}chorus_glass` }, { - type: 'pneumaticcraft:thermo_plant', item_input: { item: 'minecraft:popped_chorus_fruit' }, fluid_output: { fluid: 'integrateddynamics:liquid_chorus', amount: 125 }, pressure: 3.0, @@ -109,12 +106,28 @@ onEvent('recipes', (event) => { id: `${id_prefix}liquid_chorus_from_chorus_fruit` }, { - type: 'pneumaticcraft:thermo_plant', item_input: { item: 'integrateddynamics:proto_chorus' }, fluid_output: { fluid: 'integrateddynamics:liquid_chorus', amount: 125 }, pressure: 3.0, exothermic: false, id: `${id_prefix}liquid_chorus_from_proto_chorus` + }, + { + item_input: { item: 'rftoolsbase:machine_base' }, + item_output: { item: 'rftoolspower:power_core1' }, + fluid_input: { type: 'pneumaticcraft:fluid', fluid: 'thermal:redstone', amount: 9000 }, + pressure: 2.0, + exothermic: false, + temperature: { min_temp: 1973 }, + id: 'rftoolspower:power_core1' + }, + { + fluid_input: { type: 'pneumaticcraft:fluid', fluid: 'mekanism:lithium', amount: 100 }, + item_output: { item: 'emendatusenigmatica:lithium_dust', count: 1 }, + pressure: 2.0, + exothermic: true, + temperature: { max_temp: 453 }, + id: `${id_prefix}lithium_dust` } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/portality/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/portality/shaped.js new file mode 100644 index 0000000000..4733cbf5a1 --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/portality/shaped.js @@ -0,0 +1,66 @@ +onEvent('recipes', (event) => { + if (global.isExpertMode == false) { + return; + } + + const recipes = [ + { + output: Item.of('4x portality:frame'), + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: '#enigmatica:stonecuttables/arcane_stone', + B: 'immersiveengineering:coil_lv', + C: 'immersiveengineering:electron_tube' + }, + id: 'portality:frame' + }, + { + output: Item.of('portality:module_energy'), + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: 'portality:frame', + B: 'thermal:energy_cell', + C: 'pneumaticcraft:logistics_core', + D: 'xnet:wireless_router' + }, + id: 'portality:energy_input' + }, + { + output: Item.of('portality:module_items'), + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: 'portality:frame', + B: 'immersiveengineering:sorter', + C: 'pneumaticcraft:logistics_core', + D: 'xnet:wireless_router' + }, + id: 'portality:items_input' + }, + { + output: Item.of('portality:module_fluids'), + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: 'portality:frame', + B: 'immersiveengineering:fluid_sorter', + C: 'pneumaticcraft:logistics_core', + D: 'xnet:wireless_router' + }, + id: 'portality:fluids_input' + }, + { + output: Item.of('portality:module_interdimensional'), + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: 'portality:frame', + B: 'occultism:stable_wormhole', + C: 'pneumaticcraft:logistics_core', + D: 'xnet:wireless_router' + }, + id: 'portality:interdimensional' + } + ]; + + recipes.forEach((recipe) => { + event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js index fdc93a8344..fd5f017117 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js @@ -148,7 +148,11 @@ onEvent('recipes', (event) => { ingredients: [ { item: 'botania:ender_eye_block' }, { item: 'powah:dielectric_casing' }, - { tag: 'mekanism:crystals/uranium' } + { + type: 'forge:nbt', + item: 'pneumaticcraft:spawner_core', + nbt: '{"pneumaticcraft:SpawnerCoreStats":{"minecraft:enderman":100}}' + } ], energy: '20000000', result: { @@ -170,6 +174,62 @@ onEvent('recipes', (event) => { count: 2 }, id: `${id_prefix}uraninite` + }, + { + ingredients: [{ item: 'minecraft:blaze_rod' }], + energy: '10000000', + result: { + type: 'forge:nbt', + item: 'rftoolspower:blazing_rod', + count: 1, + nbt: '{duration:5000.0f,time:0.0f,quality:200000.0f}' + }, + id: `${id_prefix}blazing_rod` + }, + { + ingredients: [ + { item: 'rftoolsbase:machine_base' }, + { item: 'powah:capacitor_blazing' }, + { item: 'powah:capacitor_blazing' }, + { item: 'powah:capacitor_blazing' }, + { item: 'powah:capacitor_blazing' } + ], + energy: '500000', + result: { + item: 'rftoolspower:power_core2', + count: 1 + }, + id: 'rftoolspower:power_core2' + }, + { + ingredients: [ + { item: 'rftoolsbase:machine_base' }, + { item: 'powah:capacitor_nitro' }, + { item: 'powah:capacitor_nitro' }, + { item: 'powah:capacitor_nitro' }, + { item: 'powah:capacitor_nitro' } + ], + energy: '10000000', + result: { + item: 'rftoolspower:power_core3', + count: 1 + }, + id: 'rftoolspower:power_core3' + }, + { + ingredients: [ + { tag: 'mekanism:alloys/atomic' }, + { item: 'rftoolsbase:infused_diamond' }, + { item: 'fluxnetworks:flux_core' }, + { item: 'rftoolsbase:infused_diamond' }, + { tag: 'mekanism:alloys/atomic' } + ], + energy: '1000000000', + result: { + item: 'mekanism:teleportation_core', + count: 2 + }, + id: 'mekanism:teleportation_core' } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js index f4d9833804..9977495930 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js @@ -27,7 +27,7 @@ onEvent('recipes', (event) => { id: 'refinedstorage:cable' }, { - output: Item.of('refinedstorage:importer'), + output: 'refinedstorage:importer', pattern: [' C ', 'ADB', ' C '], key: { A: 'refinedstorage:cable', @@ -38,7 +38,7 @@ onEvent('recipes', (event) => { id: 'refinedstorage:importer' }, { - output: Item.of('refinedstorage:exporter'), + output: 'refinedstorage:exporter', pattern: [' C ', 'ADB', ' C '], key: { A: 'refinedstorage:cable', @@ -49,7 +49,7 @@ onEvent('recipes', (event) => { id: 'refinedstorage:exporter' }, { - output: Item.of('refinedstorage:external_storage'), + output: 'refinedstorage:external_storage', pattern: [' C ', 'AEB', ' D '], key: { A: 'refinedstorage:cable', @@ -61,7 +61,7 @@ onEvent('recipes', (event) => { id: 'refinedstorage:external_storage' }, { - output: Item.of('refinedstorage:crafter'), + output: 'refinedstorage:crafter', pattern: ['ABA', 'CEC', 'ADA'], key: { A: 'create:mechanical_crafter', @@ -71,6 +71,80 @@ onEvent('recipes', (event) => { E: 'refinedstorage:machine_casing' }, id: 'refinedstorage:crafter' + }, + { + output: 'refinedstorage:wireless_transmitter', + pattern: [' AC', 'ABA', 'BA '], + key: { + A: '#forge:wires/aluminum', + B: '#forge:rods/aluminum', + C: 'refinedstorage:advanced_processor' + }, + id: 'refinedstorage:wireless_transmitter' + }, + { + output: 'refinedstorage:range_upgrade', + pattern: ['ADA', 'CBC', 'AAA'], + key: { + A: 'refinedstorage:quartz_enriched_iron', + B: 'refinedstorage:upgrade', + C: 'refinedstorage:basic_processor', + D: 'refinedstorage:wireless_transmitter' + }, + id: 'refinedstorage:range_upgrade' + }, + { + output: Item.of('4x refinedstorage:speed_upgrade'), + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'refinedstorage:upgrade', + B: 'pneumaticcraft:glycerol', + C: { + type: 'pneumaticcraft:fluid', + tag: 'forge:lubricant', + amount: 1000 + } + }, + id: 'refinedstorage:speed_upgrade' + }, + { + output: 'refinedstorage:network_card', + pattern: ['ABA', 'ACA', 'ADA'], + key: { + A: 'refinedstorage:quartz_enriched_iron', + B: 'pneumaticcraft:printed_circuit_board', + C: 'refinedstorage:upgrade', + D: 'refinedstorage:advanced_processor' + }, + id: 'refinedstorage:network_card' + }, + { + output: 'refinedstorage:network_transmitter', + pattern: ['ABA', 'CDE', 'FGF'], + key: { + A: '#forge:gears/enderium', + B: 'rftoolsutility:matter_transmitter', + C: 'refinedstorage:construction_core', + D: 'refinedstorage:machine_casing', + E: 'refinedstorage:destruction_core', + F: '#forge:ingots/aeternium', + G: 'rftoolscontrol:cpu_core_2000' + }, + id: 'refinedstorage:network_transmitter' + }, + { + output: 'refinedstorage:network_receiver', + pattern: ['FGF', 'CDE', 'ABA'], + key: { + A: '#forge:gears/enderium', + B: 'rftoolsutility:matter_receiver', + C: 'refinedstorage:construction_core', + D: 'refinedstorage:machine_casing', + E: 'refinedstorage:destruction_core', + F: '#forge:ingots/aeternium', + G: 'rftoolscontrol:cpu_core_2000' + }, + id: 'refinedstorage:network_receiver' } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js index 00dda2d380..535e9bce49 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js @@ -15,15 +15,14 @@ onEvent('recipes', (event) => { } */ - const newRecipes = [ + const recipes = [ { output: 'rftoolsutility:screen_controller', - pattern: ['ABA', 'DCD', 'ADA'], + pattern: ['ABA', 'BCB', 'ABA'], key: { - A: '#forge:dusts/redstone', - B: 'minecraft:ender_pearl', - C: 'rftoolsbase:machine_base', - D: '#forge:glass' + A: '#forge:gears/signalum', + B: '#forge:glass/black', + C: 'thermal:charge_bench' }, id: 'rftoolsutility:screen_controller' }, @@ -39,36 +38,58 @@ onEvent('recipes', (event) => { }, { output: 'rftoolsutility:matter_receiver', - pattern: ['AAA', 'BCB', 'DDD'], + pattern: ['ABA', 'ACA', 'ADA'], key: { - A: '#forge:ingots/iron_aluminum', - B: '#forge:dusts/redstone', - C: 'rftoolsbase:machine_base', - D: 'minecraft:ender_pearl' + A: 'portality:frame', + B: 'atum:yellow_stained_crystal_glass', + C: 'occultism:stable_wormhole', + D: '#industrialforegoing:machine_frame/pity' }, id: 'rftoolsutility:matter_receiver' }, { output: 'rftoolsutility:matter_transmitter', - pattern: ['DDD', 'BCB', 'AAA'], + pattern: ['ABA', 'ACA', 'ADA'], key: { - A: '#forge:ingots/iron_aluminum', - B: '#forge:dusts/redstone', - C: 'rftoolsbase:machine_base', - D: 'minecraft:ender_pearl' + A: 'portality:frame', + B: 'atum:cyan_stained_crystal_glass', + C: 'occultism:stable_wormhole', + D: '#industrialforegoing:machine_frame/pity' }, id: 'rftoolsutility:matter_transmitter' }, + { + output: 'rftoolsutility:dialing_device', + pattern: ['ABA', 'ACA', 'AAA'], + key: { + A: 'portality:frame', + B: 'portality:controller', + C: 'xnet:wireless_router' + }, + id: 'rftoolsutility:dialing_device' + }, { output: 'rftoolsutility:charged_porter', - pattern: [' C ', 'CBC', 'ACA'], + pattern: ['EAE', 'BCB', 'EDE'], key: { - A: '#forge:ingots/iron_aluminum', - B: 'pneumaticcraft:printed_circuit_board', - C: 'minecraft:ender_pearl' + A: 'rftoolsutility:matter_beamer', + B: 'portality:frame', + C: 'rftoolsbase:tablet', + D: 'rftoolsutility:matter_transmitter', + E: 'powah:capacitor_basic_large' }, id: 'rftoolsutility:charged_porter' }, + { + output: 'rftoolsutility:advanced_charged_porter', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'powah:capacitor_nitro', + B: 'kubejs:dimensional_storage_crystal', + C: 'rftoolsutility:charged_porter' + }, + id: 'rftoolsutility:advanced_charged_porter' + }, { output: 'rftoolsbuilder:shape_card_pump', pattern: ['ABA', 'CDC', 'AEA'], @@ -95,12 +116,12 @@ onEvent('recipes', (event) => { }, { output: 'rftoolsbase:machine_infuser', - pattern: ['ABA', 'DCD', 'ABA'], + pattern: ['ABA', 'CDC', 'ABA'], key: { - A: '#forge:gems/dimensional', - B: '#forge:dusts/redstone', - C: 'rftoolsbase:machine_base', - D: '#forge:gems/diamond' + A: '#forge:gears/enderium', + B: 'rftoolsbase:infused_diamond', + C: '#forge:storage_blocks/nitro', + D: '#industrialforegoing:machine_frame/advanced' }, id: 'rftoolsbase:machine_infuser' }, @@ -109,28 +130,323 @@ onEvent('recipes', (event) => { pattern: ['ADA', 'BCB', 'ABA'], key: { A: 'minecraft:bricks', - B: '#forge:dusts/redstone', - C: 'rftoolsbase:machine_base', - D: '#forge:gems/ender' + B: 'portality:frame', + C: '#industrialforegoing:machine_frame/pity', + D: 'portality:controller' }, id: 'rftoolsbuilder:builder' }, { output: 'rftoolsbase:machine_base', - pattern: ['AAA', 'BBB'], + pattern: [' A ', 'ACA', 'BBB'], key: { A: '#forge:nuggets/invar', - B: 'pneumaticcraft:reinforced_stone_slab' + B: 'pneumaticcraft:reinforced_stone_slab', + C: 'pneumaticcraft:advanced_pcb' }, id: 'rftoolsbase:machine_base' + }, + { + output: 'rftoolsutility:flight_module', + pattern: ['ABA', 'CDC', 'EFG'], + key: { + A: 'alexsmobs:mysterious_worm', + B: Item.of( + 'rftoolsutility:syringe', + '{mobName:"alexsmobs:warped_mosco",mobId:"alexsmobs:warped_mosco",level:10}' + ), + C: 'meetyourfight:aether_glazed_cupcake', + D: 'rftoolsutility:moduleplus_template', + E: Item.of( + 'rftoolsutility:syringe', + '{mobName:"upgrade_aquatic:flare",mobId:"upgrade_aquatic:flare",level:10}' + ), + F: 'alexsmobs:tarantula_hawk_elytra', + G: Item.of( + 'rftoolsutility:syringe', + '{mobName:"alexsmobs:void_worm",mobId:"alexsmobs:void_worm",level:10}' + ) + }, + id: 'rftoolsutility:flight_module' + }, + { + output: 'rftoolspower:blazing_agitator', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'rftoolspower:blazing_rod', + B: 'powah:energizing_rod_blazing', + C: 'rftoolsbase:machine_base' + }, + id: 'rftoolspower:blazing_agitator' + }, + { + output: 'rftoolspower:cell1', + pattern: ['ABA', 'CDC', 'ACA'], + key: { + A: 'rftoolspower:power_core1', + B: 'immersiveengineering:transformer_hv', + C: 'mekanism:basic_universal_cable', + D: 'rftoolsbase:machine_frame' + }, + id: 'rftoolspower:cell1' + }, + { + output: 'rftoolscontrol:program_card', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'pneumaticcraft:plastic', + B: 'rftoolscontrol:ram_chip', + C: 'pneumaticcraft:printed_circuit_board' + }, + id: 'rftoolscontrol:program_card' + }, + { + output: 'rftoolscontrol:ram_chip', + pattern: ['AAA', 'BCB', 'AAA'], + key: { + A: 'redstonepen:relay', + B: ['#forge:wires/copper', '#forge:wires/lead'], + C: 'immersiveengineering:circuit_board' + }, + id: 'rftoolscontrol:ram_chip' + }, + { + output: 'rftoolscontrol:token', + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'minecraft:paper', + B: 'pneumaticcraft:programming_puzzle' + }, + id: 'rftoolscontrol:token' + }, + { + output: 'rftoolscontrol:craftingstation', + pattern: ['ABA', 'CDE', 'ABA'], + key: { + A: 'create:mechanical_crafter', + B: 'pneumaticcraft:printed_circuit_board', + C: 'refinedstorage:destruction_core', + D: 'rftoolsbase:machine_frame', + E: 'refinedstorage:construction_core' + }, + id: 'rftoolscontrol:craftingstation' + }, + { + output: 'rftoolscontrol:processor', + pattern: [' A ', 'BCB', ' A '], + key: { + A: 'immersiveengineering:logic_unit', + B: 'pneumaticcraft:smart_chest', + C: 'rftoolsbase:machine_frame' + }, + id: 'rftoolscontrol:processor' + }, + { + output: 'rftoolscontrol:cpu_core_500', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: '#forge:wires/lead', + B: 'refinedstorage:basic_processor', + C: 'pneumaticcraft:unassembled_pcb' + }, + id: 'rftoolscontrol:cpu_core_500' + }, + { + output: 'rftoolscontrol:cpu_core_1000', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: '#forge:wires/copper', + B: 'refinedstorage:improved_processor', + C: 'rftoolscontrol:cpu_core_500' + }, + id: 'rftoolscontrol:cpu_core_1000' + }, + { + output: 'rftoolscontrol:cpu_core_2000', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: '#forge:wires/electrum', + B: 'refinedstorage:advanced_processor', + C: 'rftoolscontrol:cpu_core_1000' + }, + id: 'rftoolscontrol:cpu_core_2000' + }, + { + output: 'rftoolscontrol:graphics_card', + pattern: ['ABA', 'CDA', 'EEE'], + key: { + A: 'pneumaticcraft:heat_sink', + B: 'pneumaticcraft:turbine_rotor', + C: 'pneumaticcraft:printed_circuit_board', + D: 'refinedstorage:advanced_processor', + E: '#forge:nuggets/copper' + }, + id: 'rftoolscontrol:graphics_card' + }, + { + output: 'rftoolscontrol:network_card', + pattern: ['ABC', 'DDD'], + key: { + A: 'refinedstorage:wireless_transmitter', + B: 'pneumaticcraft:printed_circuit_board', + C: 'refinedstorage:advanced_processor', + D: '#forge:nuggets/copper' + }, + id: 'rftoolscontrol:network_card' + }, + { + output: 'rftoolscontrol:network_identifier', + pattern: ['AAA', 'A A', 'AAA'], + key: { + A: 'rftoolscontrol:token' + }, + id: 'rftoolscontrol:network_identifier' + }, + { + output: 'rftoolscontrol:advanced_network_card', + pattern: ['ABC'], + key: { + A: 'refinedstorage:range_upgrade', + B: 'rftoolscontrol:network_card', + C: 'extrastorage:neural_processor' + }, + id: 'rftoolscontrol:advanced_network_card' + }, + { + output: 'rftoolscontrol:node', + pattern: [' A ', 'BCB'], + key: { + A: 'rftoolscontrol:network_card', + B: 'pneumaticcraft:printed_circuit_board', + C: 'rftoolsbase:machine_frame' + }, + id: 'rftoolscontrol:node' + }, + { + output: 'rftoolsutility:syringe', + pattern: [' A', ' B ', 'C '], + key: { + A: '#forge:rods/steel', + B: 'minecraft:glass_bottle', + C: 'pneumaticcraft:plastic' + }, + id: 'rftoolsutility:syringe' + }, + { + output: 'rftoolsbase:tablet', + pattern: ['AAA', 'BCD', 'EEE'], + key: { + A: 'rftoolsbase:information_screen', + B: 'rftoolscontrol:advanced_network_card', + C: 'rftoolscontrol:cpu_core_2000', + D: 'rftoolscontrol:graphics_card', + E: 'rftoolsbase:machine_base' + }, + id: 'rftoolsbase:tablet' + }, + { + output: 'rftoolspower:dimensionalcell_simple', + pattern: ['AEA', 'BCB', 'ADA'], + key: { + A: 'rftoolspower:power_core1', + B: 'kubejs:dimensional_storage_crystal', + C: 'rftoolsbase:machine_frame', + D: 'powah:ender_core', + E: 'rftoolscontrol:advanced_network_card' + }, + id: 'rftoolspower:dimensionalcell_simple' + }, + { + output: 'rftoolspower:dimensionalcell', + pattern: ['ADA', 'BCB', 'ADA'], + key: { + A: 'rftoolspower:power_core2', + B: 'kubejs:dimensional_storage_crystal', + C: 'rftoolspower:dimensionalcell_simple', + D: 'rftoolsbase:infused_diamond' + }, + id: 'rftoolspower:dimensionalcell' + }, + { + output: 'rftoolspower:dimensionalcell_advanced', + pattern: ['ADA', 'BCB', 'ADA'], + key: { + A: 'rftoolspower:power_core3', + B: 'kubejs:dimensional_storage_crystal', + C: 'rftoolspower:dimensionalcell', + D: '#forge:gems/mana_diamond' + }, + id: 'rftoolspower:dimensionalcell_advanced' + }, + { + output: 'rftoolsutility:crafter1', + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: 'rftoolscontrol:ram_chip', + B: 'pneumaticcraft:smart_chest', + C: 'rftoolscontrol:craftingstation', + D: 'rftoolsbase:machine_frame' + }, + id: 'rftoolsutility:crafter1' + }, + { + output: 'rftoolsutility:crafter2', + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: 'rftoolscontrol:ram_chip', + B: 'powah:capacitor_blazing', + C: 'rftoolscontrol:craftingstation', + D: 'rftoolsutility:crafter1' + }, + id: 'rftoolsutility:crafter2' + }, + { + output: 'rftoolsutility:crafter3', + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: 'rftoolscontrol:ram_chip', + B: 'powah:capacitor_nitro', + C: 'rftoolscontrol:craftingstation', + D: 'rftoolsutility:crafter2' + }, + id: 'rftoolsutility:crafter3' + }, + { + output: 'rftoolsstorage:modular_storage', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'thermal:gray_rockwool', + B: '#forge:plates/steel', + C: 'thermal:machine_frame' + }, + id: 'rftoolsstorage:modular_storage' + }, + { + output: 'rftoolsstorage:storage_module0', + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: '#thermal:glass/hardened', + B: 'ironchest:silver_chest', + C: 'buildinggadgets:construction_paste', + D: '#forge:gears/osmium' + }, + id: 'rftoolsstorage:storage_module0' + }, + { + output: 'rftoolsbuilder:shape_card_quarry', + pattern: [' A ', 'BCB', 'DED'], + key: { + A: 'mekanism:robit', + B: 'mekanism:teleportation_core', + C: 'rftoolsbuilder:shape_card_def', + D: '#forge:circuits/ultimate', + E: 'mekanismtools:refined_obsidian_paxel' + }, + id: 'rftoolsbuilder:shape_card_quarry' } ]; - newRecipes.forEach((recipe) => { - if (recipe.id) { - event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); - } else { - event.shaped(recipe.output, recipe.pattern, recipe.key); - } + recipes.forEach((recipe) => { + event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); }); }); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped_coby_nbt.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped_coby_nbt.js new file mode 100644 index 0000000000..ae6ec9c0f3 --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped_coby_nbt.js @@ -0,0 +1,46 @@ +onEvent('recipes', (event) => { + if (global.isExpertMode == false) { + return; + } + + const recipes = [ + { + result: { item: 'rftoolsstorage:storage_module1' }, + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: { tag: 'thermal:glass/hardened' }, + B: { item: 'ironchest:copper_chest' }, + C: { item: 'buildinggadgets:construction_paste' }, + D: { item: 'rftoolsstorage:storage_module0' } + }, + id: 'rftoolsstorage:storage_module1' + }, + { + result: { item: 'rftoolsstorage:storage_module2' }, + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: { tag: 'thermal:glass/hardened' }, + B: { item: 'ironchest:silver_chest' }, + C: { item: 'buildinggadgets:construction_paste' }, + D: { item: 'rftoolsstorage:storage_module1' } + }, + id: 'rftoolsstorage:storage_module2' + }, + { + result: { item: 'rftoolsstorage:storage_module3' }, + pattern: ['ABA', 'CDC', 'ABA'], + key: { + A: { tag: 'thermal:glass/hardened' }, + B: { item: 'ironchest:diamond_chest' }, + C: { item: 'buildinggadgets:construction_paste' }, + D: { item: 'rftoolsstorage:storage_module2' } + }, + id: 'rftoolsstorage:storage_module3' + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'mcjtylib:copy_nbt'; + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js index 3a95382e39..bd7e8261f8 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js @@ -33,6 +33,30 @@ onEvent('recipes', (event) => { fluid: Fluid.of('tconstruct:molten_netherite', 5184), output: 'extrastorage:netherite_crafter', id: 'extrastorage:netherite_crafter' + }, + { + input: 'kubejs:memory_basic_empty', + fluid: Fluid.of('pneumaticcraft:memory_essence', 9000), + output: 'kubejs:memory_basic_filled', + id: `${id_prefix}memory_basic_filled` + }, + { + input: 'kubejs:memory_advanced_empty', + fluid: Fluid.of('pneumaticcraft:memory_essence', 18000), + output: 'kubejs:memory_advanced_filled', + id: `${id_prefix}memory_advanced_filled` + }, + { + input: 'kubejs:memory_elite_empty', + fluid: Fluid.of('pneumaticcraft:memory_essence', 36000), + output: 'kubejs:memory_elite_filled', + id: `${id_prefix}memory_elite_filled` + }, + { + input: 'kubejs:memory_ultimate_empty', + fluid: Fluid.of('pneumaticcraft:memory_essence', 72000), + output: 'kubejs:memory_ultimate_filled', + id: `${id_prefix}memory_ultimate_filled` } ]; recipes.forEach((recipe) => { diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/induction_smelter.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/induction_smelter.js index 81a084ba26..fab4d65ba0 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/induction_smelter.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/induction_smelter.js @@ -2,37 +2,50 @@ onEvent('recipes', (event) => { if (global.isExpertMode == false) { return; } + const id_prefix = 'enigmatica:expert/thermal/induction_smelter'; const recipes = [ { inputs: [Item.of('#forge:ingots/cobalt', 3), 'thermal:blizz_powder'], - outputs: [Item.of('undergarden:froststeel_ingot', 3)] + outputs: [Item.of('undergarden:froststeel_ingot', 3)], + id: `${id_prefix}froststeel_ingot` }, { inputs: ['glassential:glass_ghostly', 'quark:white_crystal_cluster', 'atum:sand'], - outputs: [Item.of('atum:crystal_glass', 2)] + outputs: [Item.of('atum:crystal_glass', 2)], + id: `${id_prefix}crystal_glass` }, { inputs: ['#forge:clay', '#forge:sand', '#forge:gravel'], - outputs: [Item.of('tconstruct:seared_brick', 2)] + outputs: [Item.of('tconstruct:seared_brick', 2)], + id: `${id_prefix}seared_brick` }, { inputs: ['tconstruct:grout'], - outputs: ['tconstruct:seared_brick'] + outputs: ['tconstruct:seared_brick'], + id: `${id_prefix}seared_brick_from_grout` }, { inputs: ['minecraft:magma_cream', '#minecraft:soul_fire_base_blocks', '#forge:gravel'], - outputs: [Item.of('tconstruct:scorched_brick', 2)] + outputs: [Item.of('tconstruct:scorched_brick', 2)], + id: `${id_prefix}scorched_brick` }, { inputs: ['tconstruct:nether_grout'], - outputs: ['tconstruct:scorched_brick'] + outputs: ['tconstruct:scorched_brick'], + id: `${id_prefix}scorched_brick_from_nether_grout` + }, + { + inputs: [ + Ingredient.of('4x #forge:dusts/lithium'), + Ingredient.of('3x #forge:ingots/aluminum'), + Ingredient.of('#forge:ingots/copper') + ], + outputs: [Item.of('4x mekanism:alloy_reinforced')], + id: `${id_prefix}alloy_reinforced` } ]; recipes.forEach((recipe) => { - const re = event.recipes.thermal.smelter(recipe.outputs, recipe.inputs); - if (recipe.id) { - re.id(recipe.id); - } + event.recipes.thermal.smelter(recipe.outputs, recipe.inputs).id(recipe.id); }); }); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/shaped.js index d4f0e71dab..86644335cc 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/shaped.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/shaped.js @@ -73,6 +73,53 @@ onEvent('recipes', (event) => { B: '#forge:rods/lead' }, id: 'kubejs:thermal_redstone_servo_with_lead' + }, + { + output: 'thermal:charge_bench', + pattern: ['AAA', 'BCB', 'DBD'], + key: { + A: '#forge:ingots/electrum', + B: 'thermal:rf_coil', + C: 'thermal:energy_cell_frame', + D: '#forge:ingots/lead' + }, + id: 'thermal:charge_bench' + }, + { + output: 'thermal:upgrade_augment_1', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: '#forge:gears/invar', + B: 'thermal:energy_cell', + C: '#xnet:connectors', + D: 'pneumaticcraft:advanced_pcb', + E: 'thermal:fluid_cell' + }, + id: 'thermal:augments/upgrade_augment_1' + }, + { + output: 'thermal:upgrade_augment_2', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: '#forge:gears/lumium', + B: 'rftoolscontrol:cpu_core_1000', + C: 'kubejs:memory_advanced_filled', + D: 'thermal:upgrade_augment_1', + E: 'powah:capacitor_hardened' + }, + id: 'thermal:augments/upgrade_augment_2' + }, + { + output: 'thermal:upgrade_augment_3', + pattern: ['ABA', 'CDC', 'AEA'], + key: { + A: '#forge:gears/enderium', + B: 'rftoolscontrol:cpu_core_2000', + C: 'kubejs:memory_elite_filled', + D: 'thermal:upgrade_augment_2', + E: 'powah:capacitor_niotic' + }, + id: 'thermal:augments/upgrade_augment_3' } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/wstweaks/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/wstweaks/shaped.js new file mode 100644 index 0000000000..dc57cfae48 --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/wstweaks/shaped.js @@ -0,0 +1,44 @@ +onEvent('recipes', (event) => { + if (global.isExpertMode == false) { + return; + } + + /* + , + { + output: '', + pattern: ['', '', ''], + key: { + A: '' + }, + id: '' + } + */ + + const recipes = [ + { + output: 'wstweaks:lava_blade', + pattern: [' AB', 'ACA', 'DA '], + key: { + A: 'rftoolspower:blazing_rod', + B: 'betterendforge:aeternium_sword_blade', + C: '#forge:gems/nitro', + D: 'betterendforge:aeternium_sword_handle' + }, + id: 'wstweaks:lava_blade' + }, + { + output: 'wstweaks:blaze_blade', + pattern: [' A ', 'ABA', ' A '], + key: { + A: 'tconstruct:blazing_bone', + B: 'wstweaks:lava_blade' + }, + id: 'wstweaks:blaze_blade' + } + ]; + + recipes.forEach((recipe) => { + event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/tags/items/occultism/occultism_spirit_tooltip.js b/kubejs/server_scripts/enigmatica/kubejs/expert/tags/items/occultism/occultism_spirit_tooltip.js index f1e8c9c85b..9905d203d3 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/tags/items/occultism/occultism_spirit_tooltip.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/tags/items/occultism/occultism_spirit_tooltip.js @@ -8,7 +8,7 @@ onEvent('item.tags', (event) => { 'bloodmagic:soulpickaxe', 'bloodmagic:soulshovel', 'bloodmagic:soulscythe', - 'kubejs:spirit_heat_exchanger', + 'kubejs:spirit_entropic_gateway', 'losttrinkets:magical_feathers', 'magicfeather:magicfeather' ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/botanypots/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/botanypots/shaped.js index 849cef874c..9420e52233 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/botanypots/shaped.js +++ b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/botanypots/shaped.js @@ -16,6 +16,18 @@ onEvent('recipes', (event) => { } ]; + colors.forEach((color) => { + event + .shaped(`botanypots:${color}_botany_pot`, ['ADA', 'ABA', 'ACA'], { + A: `minecraft:${color}_terracotta`, + B: 'minecraft:flower_pot', + C: 'minecraft:bone_block', + D: 'minecraft:water_bucket' + }) + .id(`botanypots:crafting/${color}_botany_pot`); + event.remove({ id: `botanypots:crafting/compact_hopper_${color}_botany_pot` }); + }); + recipes.forEach((recipe) => { event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); }); diff --git a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/enigmatica/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/enigmatica/shaped.js index 7527b948d2..82a4a0b634 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/enigmatica/shaped.js +++ b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/enigmatica/shaped.js @@ -42,6 +42,216 @@ onEvent('recipes', (event) => { F: 'minecraft:ender_eye' }, id: `${id_prefix}magical_feathers` + }, + { + output: 'ironjetpacks:hardened_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: 'powah:steel_energized', + B: 'powah:battery_hardened', + C: 'thermal:hazmat_chestplate', + D: 'ironjetpacks:hardened_thruster', + E: 'powah:reactor_hardened' + }, + id: `${id_prefix}ironjetpacks/hardened_jetpack` + }, + { + output: 'ironjetpacks:hardened_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: 'powah:steel_energized', + B: 'powah:capacitor_hardened', + C: 'powah:furnator_hardened', + D: 'powah:reactor_hardened' + }, + id: `${id_prefix}ironjetpacks/hardened_thruster` + }, + + { + output: 'ironjetpacks:invar_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: '#forge:plates/invar', + B: 'thermal:upgrade_augment_1', + C: 'ironjetpacks:hardened_jetpack', + D: 'ironjetpacks:invar_thruster', + E: '#forge:gears/invar' + }, + id: `${id_prefix}ironjetpacks/invar_jetpack` + }, + { + output: 'ironjetpacks:invar_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: '#forge:plates/invar', + B: 'powah:capacitor_hardened', + C: 'powah:furnator_hardened', + D: '#forge:gears/invar' + }, + id: `${id_prefix}ironjetpacks/invar_thruster` + }, + { + output: 'ironjetpacks:blazing_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: 'powah:crystal_blazing', + B: 'powah:battery_blazing', + C: 'ironjetpacks:invar_jetpack', + D: 'ironjetpacks:blazing_thruster', + E: 'powah:reactor_blazing' + }, + id: `${id_prefix}ironjetpacks/blazing_jetpack` + }, + { + output: 'ironjetpacks:blazing_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: 'powah:crystal_blazing', + B: 'powah:capacitor_blazing', + C: 'powah:furnator_blazing', + D: 'powah:reactor_blazing' + }, + id: `${id_prefix}ironjetpacks/blazing_thruster` + }, + { + output: 'ironjetpacks:signalum_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: '#forge:plates/signalum', + B: 'thermal:upgrade_augment_2', + C: 'ironjetpacks:blazing_jetpack', + D: 'ironjetpacks:signalum_thruster', + E: '#forge:gears/signalum' + }, + id: `${id_prefix}ironjetpacks/signalum_jetpack` + }, + { + output: 'ironjetpacks:signalum_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: '#forge:plates/signalum', + B: 'powah:capacitor_blazing', + C: 'powah:furnator_blazing', + D: '#forge:gears/signalum' + }, + id: `${id_prefix}ironjetpacks/signalum_thruster` + }, + { + output: 'ironjetpacks:niotic_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: 'powah:crystal_niotic', + B: 'powah:battery_niotic', + C: 'ironjetpacks:signalum_jetpack', + D: 'ironjetpacks:niotic_thruster', + E: 'powah:reactor_niotic' + }, + id: `${id_prefix}ironjetpacks/niotic_jetpack` + }, + { + output: 'ironjetpacks:niotic_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: 'powah:crystal_niotic', + B: 'powah:capacitor_niotic', + C: 'powah:furnator_niotic', + D: 'powah:reactor_niotic' + }, + id: `${id_prefix}ironjetpacks/niotic_thruster` + }, + + { + output: 'ironjetpacks:lumium_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: '#forge:plates/lumium', + B: 'thermal:dynamo_fuel_augment', + C: 'ironjetpacks:niotic_jetpack', + D: 'ironjetpacks:lumium_thruster', + E: '#forge:gears/lumium' + }, + id: `${id_prefix}ironjetpacks/lumium_jetpack` + }, + { + output: 'ironjetpacks:lumium_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: '#forge:plates/lumium', + B: 'powah:capacitor_niotic', + C: 'powah:furnator_niotic', + D: '#forge:gears/lumium' + }, + id: `${id_prefix}ironjetpacks/lumium_thruster` + }, + + { + output: 'ironjetpacks:spirited_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: 'powah:crystal_spirited', + B: 'powah:battery_spirited', + C: 'ironjetpacks:lumium_jetpack', + D: 'ironjetpacks:spirited_thruster', + E: 'powah:reactor_spirited' + }, + id: `${id_prefix}ironjetpacks/spirited_jetpack` + }, + { + output: 'ironjetpacks:spirited_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: 'powah:crystal_spirited', + B: 'powah:capacitor_spirited', + C: 'powah:furnator_spirited', + D: 'powah:reactor_spirited' + }, + id: `${id_prefix}ironjetpacks/spirited_thruster` + }, + { + output: 'ironjetpacks:enderium_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: '#forge:plates/enderium', + B: 'thermal:upgrade_augment_3', + C: 'ironjetpacks:spirited_jetpack', + D: 'ironjetpacks:enderium_thruster', + E: '#forge:gears/enderium' + }, + id: `${id_prefix}ironjetpacks/enderium_jetpack` + }, + { + output: 'ironjetpacks:enderium_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: '#forge:plates/enderium', + B: 'powah:capacitor_spirited', + C: 'powah:furnator_spirited', + D: '#forge:gears/enderium' + }, + id: `${id_prefix}ironjetpacks/enderium_thruster` + }, + { + output: 'ironjetpacks:nitro_jetpack', + pattern: ['ABA', 'ECE', 'D D'], + key: { + A: 'powah:crystal_nitro', + B: 'powah:battery_nitro', + C: 'ironjetpacks:enderium_jetpack', + D: 'ironjetpacks:nitro_thruster', + E: 'powah:reactor_nitro' + }, + id: `${id_prefix}ironjetpacks/nitro_jetpack` + }, + { + output: 'ironjetpacks:nitro_thruster', + pattern: [' B ', 'BDB', 'ACA'], + key: { + A: 'powah:crystal_nitro', + B: 'powah:capacitor_nitro', + C: 'powah:furnator_nitro', + D: 'powah:reactor_nitro' + }, + id: `${id_prefix}ironjetpacks/nitro_thruster` } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/mekanism/crafting_mek_data.js b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/mekanism/crafting_mek_data.js new file mode 100644 index 0000000000..080a87b8ea --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/mekanism/crafting_mek_data.js @@ -0,0 +1,117 @@ +onEvent('recipes', (event) => { + if (global.isNormalMode == false) { + return; + } + + const recipes = [ + { + output: 'mekanism:elite_combining_factory', + pattern: ['ACA', 'IPI', 'ACA'], + key: { + P: { item: 'mekanism:advanced_combining_factory' }, + C: { tag: 'forge:circuits/elite' }, + I: { tag: 'forge:ingots/gold_bronze' }, + A: { tag: 'mekanism:alloys/reinforced' } + }, + id: 'mekanism:factory/elite/combining' + }, + { + output: 'mekanism:elite_enriching_factory', + pattern: ['ACA', 'IPI', 'ACA'], + key: { + P: { item: 'mekanism:advanced_enriching_factory' }, + C: { tag: 'forge:circuits/elite' }, + I: { tag: 'forge:ingots/gold_bronze' }, + A: { tag: 'mekanism:alloys/reinforced' } + }, + id: 'mekanism:factory/elite/enriching' + }, + { + output: 'mekanism:elite_crushing_factory', + pattern: ['ACA', 'IPI', 'ACA'], + key: { + P: { item: 'mekanism:advanced_crushing_factory' }, + C: { tag: 'forge:circuits/elite' }, + I: { tag: 'forge:ingots/gold_bronze' }, + A: { tag: 'mekanism:alloys/reinforced' } + }, + id: 'mekanism:factory/elite/crushing' + }, + { + output: 'mekanism:elite_compressing_factory', + pattern: ['ACA', 'IPI', 'ACA'], + key: { + P: { item: 'mekanism:advanced_compressing_factory' }, + C: { tag: 'forge:circuits/elite' }, + I: { tag: 'forge:ingots/gold_bronze' }, + A: { tag: 'mekanism:alloys/reinforced' } + }, + id: 'mekanism:factory/elite/compressing' + }, + { + output: 'mekanism:elite_smelting_factory', + pattern: ['ACA', 'IPI', 'ACA'], + key: { + P: { item: 'mekanism:advanced_smelting_factory' }, + C: { tag: 'forge:circuits/elite' }, + I: { tag: 'forge:ingots/gold_bronze' }, + A: { tag: 'mekanism:alloys/reinforced' } + }, + id: 'mekanism:factory/elite/smelting' + }, + { + output: 'mekanism:elite_sawing_factory', + pattern: ['ACA', 'IPI', 'ACA'], + key: { + P: { item: 'mekanism:advanced_sawing_factory' }, + C: { tag: 'forge:circuits/elite' }, + I: { tag: 'forge:ingots/gold_bronze' }, + A: { tag: 'mekanism:alloys/reinforced' } + }, + id: 'mekanism:factory/elite/sawing' + }, + { + output: 'mekanism:elite_purifying_factory', + pattern: ['ACA', 'IPI', 'ACA'], + key: { + P: { item: 'mekanism:advanced_purifying_factory' }, + C: { tag: 'forge:circuits/elite' }, + I: { tag: 'forge:ingots/gold_bronze' }, + A: { tag: 'mekanism:alloys/reinforced' } + }, + id: 'mekanism:factory/elite/purifying' + }, + { + output: 'mekanism:elite_injecting_factory', + pattern: ['ACA', 'IPI', 'ACA'], + key: { + P: { item: 'mekanism:advanced_injecting_factory' }, + C: { tag: 'forge:circuits/elite' }, + I: { tag: 'forge:ingots/gold_bronze' }, + A: { tag: 'mekanism:alloys/reinforced' } + }, + id: 'mekanism:factory/elite/injecting' + }, + { + output: 'mekanism:elite_infusing_factory', + pattern: ['ACA', 'IPI', 'ACA'], + key: { + P: { item: 'mekanism:advanced_infusing_factory' }, + C: { tag: 'forge:circuits/elite' }, + I: { tag: 'forge:ingots/gold_bronze' }, + A: { tag: 'mekanism:alloys/reinforced' } + }, + id: 'mekanism:factory/elite/infusing' + } + ]; + recipes.forEach((recipe) => { + event + .custom({ + type: 'mekanism:mek_data', + result: Item.of(recipe.output).toJson(), + pattern: recipe.pattern, + key: recipe.key + }) + .id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/thermal/machine/induction_smelter.js b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/thermal/machine/induction_smelter.js index 16275e0e9f..6fb045e76d 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/thermal/machine/induction_smelter.js +++ b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/thermal/machine/induction_smelter.js @@ -8,6 +8,14 @@ onEvent('recipes', (event) => { { inputs: ['#forge:ingots/enderium', Item.of('fluxnetworks:flux_dust', 8)], outputs: [Item.of('compactmachines:wall', 32)] + }, + { + inputs: ['#forge:dusts/refined_obsidian', '#forge:ingots/osmium'], + outputs: [Item.of('mekanism:ingot_refined_obsidian')] + }, + { + inputs: ['#forge:dusts/glowstone', '#forge:ingots/osmium'], + outputs: [Item.of('mekanism:ingot_refined_glowstone')] } ] }; diff --git a/kubejs/startup_scripts/item_registry.js b/kubejs/startup_scripts/item_registry.js index 575346553e..a9920f1298 100644 --- a/kubejs/startup_scripts/item_registry.js +++ b/kubejs/startup_scripts/item_registry.js @@ -25,7 +25,7 @@ onEvent('item.registry', (event) => { 'superheated_steel_ingot', 'hot_compressed_iron_ingot', 'dimensional_storage_crystal', - 'spirit_heat_exchanger', + 'spirit_entropic_gateway', 'amadron_survey_tools', 'basalt_powder', 'coke_brick_blend', @@ -33,13 +33,21 @@ onEvent('item.registry', (event) => { 'blast_brick_blend', 'blast_brick', 'red_nether_brick', - 'ground_meat' + 'ground_meat', + 'memory_basic_empty', + 'memory_basic_filled', + 'memory_advanced_empty', + 'memory_advanced_filled', + 'memory_elite_empty', + 'memory_elite_filled', + 'memory_ultimate_empty', + 'memory_ultimate_filled' ]; const ritualDummies = [ 'summon_pink_wither', 'summon_pharaoh', - 'craft_spirit_heat_exchanger', + 'craft_spirit_entropic_gateway', 'craft_magical_feathers', 'craft_magicfeather', 'craft_soulsword', @@ -49,7 +57,8 @@ onEvent('item.registry', (event) => { 'craft_soulscythe', 'craft_attunement_altar', 'craft_mana_collector', - 'craft_logic_director' + 'craft_logic_director', + 'craft_robit' ]; const reusableItemTextures = [ @@ -65,6 +74,9 @@ onEvent('item.registry', (event) => { { name: 'dynamo_fuel_augment_mk3', texture: 'dynamo_fuel_augment' }, { name: 'dynamo_fuel_augment_mk4', texture: 'dynamo_fuel_augment' }, + { name: 'basic_memory_package', texture: 'assembly_package_filled' }, + { name: 'basic_memory_assembly', texture: 'assembly_package_processing' }, + { name: 'basic_circuit_package', texture: 'assembly_package_filled' }, { name: 'basic_circuit_assembly', texture: 'assembly_package_processing' }, { name: 'basic_lenses_package', texture: 'assembly_package_filled' }, diff --git a/local/ftbchunks/client-config.snbt b/local/ftbchunks/client-config.snbt index f81ea399be..badadc3a3a 100644 --- a/local/ftbchunks/client-config.snbt +++ b/local/ftbchunks/client-config.snbt @@ -20,10 +20,6 @@ # Default: false debug_info: false - # Moves map update tasks to a different thread. May cause CME errors and some weird chunks but could improve performance. - # Default: false - experimental_performance_improvement: false - # Advanced option. Foliage darkness # Default: 50 # Range: 0 ~ 255 diff --git a/minecraftinstance.json b/minecraftinstance.json index 897ead27f2..908a3f4229 100644 --- a/minecraftinstance.json +++ b/minecraftinstance.json @@ -30,8 +30,8 @@ "isUnlocked": true, "javaArgsOverride": null, "javaDirOverride": null, - "lastPlayed": "2021-10-20T17:51:29.8826371Z", - "playedCount": 423, + "lastPlayed": "2021-11-01T18:46:58.1398699Z", + "playedCount": 438, "manifest": null, "fileDate": "0001-01-01T00:00:00", "installedModpack": null, @@ -47,8 +47,8 @@ "name": "Enigmatica6", "cachedScans": [], "isValid": true, - "lastPreviousMatchUpdate": "2021-10-12T19:06:46.2317377Z", - "lastRefreshAttempt": "2021-10-12T21:07:46.652408+02:00", + "lastPreviousMatchUpdate": "2021-11-01T05:00:01.0170699Z", + "lastRefreshAttempt": "2021-11-01T06:00:06.0780672+01:00", "isEnabled": true, "isPinned": false, "gameVersion": "1.16.5", @@ -651,14 +651,14 @@ "addonID": 409429, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3490147, - "displayName": "configswapper-2.1.jar", - "fileName": "configswapper-2.1.jar", - "fileDate": "2021-10-13T17:57:47.14Z", - "fileLength": 15952, + "id": 3510587, + "displayName": "configswapper-2.2.jar", + "fileName": "configswapper-2.2.jar", + "fileDate": "2021-10-31T15:27:59.05Z", + "fileLength": 16284, "releaseType": 2, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3490/147/configswapper-2.1.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3510/587/configswapper-2.2.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -666,13 +666,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 3368433581, + "fingerprint": 1756847174, "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 3647950335, + "fingerprint": 1708134770, "type": 3, "invalidFingerprint": false }, @@ -683,10 +683,9 @@ "invalidFingerprint": false } ], - "packageFingerprint": 3310279220, + "packageFingerprint": 848396809, "gameVersion": [ - "1.16.5", - "Forge" + "1.16.5" ], "sortableGameVersion": [ { @@ -694,14 +693,7 @@ "gameVersion": "1.16.5", "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", "gameVersionName": "1.16.5", - "gameVersionTypeId": 0 - }, - { - "gameVersionPadded": "0", - "gameVersion": "", - "gameVersionReleaseDate": "2019-08-01T00:00:00Z", - "gameVersionName": "Forge", - "gameVersionTypeId": 0 + "gameVersionTypeId": 70886 } ], "hasInstallScript": false, @@ -709,20 +701,20 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2538989, + "renderCacheId": 2564965, "projectId": 409429, - "packageFingerprintId": 761769325, - "gameVersionDateReleased": "2019-08-01T00:00:00Z", - "gameVersionMappingId": 3379660, - "gameVersionId": 7498, + "packageFingerprintId": 774353770, + "gameVersionDateReleased": "2021-01-15T14:14:48.91Z", + "gameVersionMappingId": 3428713, + "gameVersionId": 8203, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "configswapper-2.1.jar" + "FileNameOnDisk": "configswapper-2.2.jar" }, "dateInstalled": "2021-10-13T18:52:15.4084284Z", - "dateUpdated": "2021-10-13T18:52:15.4894313Z", - "dateLastUpdateAttempted": "2021-10-13T18:52:15.4894313Z", - "status": 5, + "dateUpdated": "2021-11-01T18:01:23.3330499Z", + "dateLastUpdateAttempted": "2021-11-01T18:01:23.3330499Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -1197,70 +1189,90 @@ "addonID": 306549, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3445360, - "displayName": "Tips-1.16.5-4.0.10.jar", - "fileName": "Tips-1.16.5-4.0.10.jar", - "fileDate": "2021-08-31T23:16:31.333Z", - "fileLength": 63459, + "id": 3498966, + "displayName": "Tips-1.16.5-4.0.12.jar", + "fileName": "Tips-1.16.5-4.0.12.jar", + "fileDate": "2021-10-22T12:23:46.027Z", + "fileLength": 64093, "releaseType": 3, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3445/360/Tips-1.16.5-4.0.10.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3498/966/Tips-1.16.5-4.0.12.jar", "isAlternate": false, - "alternateFileId": 3445361, + "alternateFileId": 3498967, "dependencies": [ { - "id": 0, + "id": 76428305, "addonId": 228525, "type": 3, - "fileId": 0 + "fileId": 3498966 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 2382889519, - "type": 0, + "fingerprint": 983257518, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 871510552, - "type": 0, + "fingerprint": 3646464279, + "type": 3, "invalidFingerprint": false }, { "foldername": "net", "fingerprint": 3590871681, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 867245095, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 4225229060, + "packageFingerprint": 1605750088, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2550460, + "projectId": 306549, + "packageFingerprintId": 767813119, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3403025, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "Tips-1.16.5-4.0.10.jar" + "FileNameOnDisk": "Tips-1.16.5-4.0.12.jar" }, "dateInstalled": "2021-07-05T20:20:47.9641636Z", - "dateUpdated": "2021-09-02T12:00:16.9144647Z", - "dateLastUpdateAttempted": "2021-09-02T12:00:16.9144647Z", + "dateUpdated": "2021-10-25T18:01:52.6051228Z", + "dateLastUpdateAttempted": "2021-10-25T18:01:52.6051228Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -1486,81 +1498,101 @@ "addonID": 232758, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3474910, - "displayName": "CyclopsCore-1.16.5-1.11.10.jar", - "fileName": "CyclopsCore-1.16.5-1.11.10.jar", - "fileDate": "2021-09-27T17:37:47.15Z", - "fileLength": 844480, + "id": 3498270, + "displayName": "CyclopsCore-1.16.5-1.12.0.jar", + "fileName": "CyclopsCore-1.16.5-1.12.0.jar", + "fileDate": "2021-10-21T18:02:02.133Z", + "fileLength": 845674, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3474/910/CyclopsCore-1.16.5-1.11.10.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3498/270/CyclopsCore-1.16.5-1.12.0.jar", "isAlternate": false, - "alternateFileId": 3474911, + "alternateFileId": 3498271, "dependencies": [], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 3548156480, - "type": 0, + "fingerprint": 485471699, + "type": 3, "invalidFingerprint": false }, { "foldername": "org", - "fingerprint": 780530223, - "type": 0, + "fingerprint": 1076845015, + "type": 3, "invalidFingerprint": false }, { - "foldername": "assets", - "fingerprint": 3876077990, - "type": 0, + "foldername": "logo.png", + "fingerprint": 2866114932, + "type": 3, + "invalidFingerprint": false + }, + { + "foldername": "logo_small.png", + "fingerprint": 3202528997, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 3536622113, - "type": 0, + "type": 3, "invalidFingerprint": false }, { - "foldername": "logo_small.png", - "fingerprint": 3202528997, - "type": 0, + "foldername": "assets", + "fingerprint": 3876077990, + "type": 3, "invalidFingerprint": false }, { "foldername": "data", "fingerprint": 2620577581, - "type": 0, - "invalidFingerprint": false - }, - { - "foldername": "logo.png", - "fingerprint": 2866114932, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 297894024, + "packageFingerprint": 1911181542, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2549572, + "projectId": 232758, + "packageFingerprintId": 767326376, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3401097, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "CyclopsCore-1.16.5-1.11.10.jar" + "FileNameOnDisk": "CyclopsCore-1.16.5-1.12.0.jar" }, "dateInstalled": "2021-07-05T20:20:47.9741847Z", - "dateUpdated": "2021-09-27T17:47:39.8746612Z", - "dateLastUpdateAttempted": "2021-09-27T17:47:39.8746612Z", + "dateUpdated": "2021-10-25T18:00:02.5426063Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:02.5426063Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -1714,7 +1746,7 @@ "dateInstalled": "2021-07-05T20:20:52.5203908Z", "dateUpdated": "2021-10-20T17:46:28.3497147Z", "dateLastUpdateAttempted": "2021-10-20T17:46:28.3497147Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -2155,7 +2187,7 @@ "dateInstalled": "2021-07-05T20:20:47.9641636Z", "dateUpdated": "2021-10-20T17:46:17.4528224Z", "dateLastUpdateAttempted": "2021-10-20T17:46:17.4528224Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -2266,7 +2298,7 @@ "dateInstalled": "2021-07-05T20:20:47.9641636Z", "dateUpdated": "2021-10-20T17:46:15.3101126Z", "dateLastUpdateAttempted": "2021-10-20T17:46:15.3101126Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -3438,7 +3470,7 @@ "dateInstalled": "2021-09-16T06:15:58.9533579Z", "dateUpdated": "2021-10-20T17:46:07.6218196Z", "dateLastUpdateAttempted": "2021-10-20T17:46:07.6218196Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -5690,14 +5722,14 @@ "addonID": 398521, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3491509, - "displayName": "Farmer's Delight 0.5 - 1.16.5", - "fileName": "FarmersDelight-1.16.5-0.5.0.jar", - "fileDate": "2021-10-15T02:35:30.287Z", - "fileLength": 2525752, + "id": 3503844, + "displayName": "Farmer's Delight 0.5.1 - 1.16.5", + "fileName": "FarmersDelight-1.16.5-0.5.1.jar", + "fileDate": "2021-10-25T00:04:34.27Z", + "fileLength": 2528891, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3491/509/FarmersDelight-1.16.5-0.5.0.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3503/844/FarmersDelight-1.16.5-0.5.1.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -5705,31 +5737,31 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 409344962, + "fingerprint": 3309110213, "type": 3, "invalidFingerprint": false }, { "foldername": "vectorwing", - "fingerprint": 871107604, + "fingerprint": 855020805, "type": 3, "invalidFingerprint": false }, { "foldername": ".cache", - "fingerprint": 609314625, + "fingerprint": 4131449225, "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 3811828388, + "fingerprint": 1901154067, "type": 3, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 1902147059, + "fingerprint": 874056749, "type": 3, "invalidFingerprint": false }, @@ -5758,7 +5790,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 1640513900, + "packageFingerprint": 2479909544, "gameVersion": [ "1.16.5", "Forge" @@ -5769,14 +5801,14 @@ "gameVersion": "1.16.5", "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", "gameVersionName": "1.16.5", - "gameVersionTypeId": 0 + "gameVersionTypeId": 70886 }, { "gameVersionPadded": "0", "gameVersion": "", "gameVersionReleaseDate": "2019-08-01T00:00:00Z", "gameVersionName": "Forge", - "gameVersionTypeId": 0 + "gameVersionTypeId": 68441 } ], "hasInstallScript": false, @@ -5784,19 +5816,19 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2540746, + "renderCacheId": 2556194, "projectId": 398521, - "packageFingerprintId": 762669671, + "packageFingerprintId": 769663731, "gameVersionDateReleased": "2019-08-01T00:00:00Z", - "gameVersionMappingId": 3383078, + "gameVersionMappingId": 3411288, "gameVersionId": 7498, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "FarmersDelight-1.16.5-0.5.0.jar" + "FileNameOnDisk": "FarmersDelight-1.16.5-0.5.1.jar" }, "dateInstalled": "2021-07-05T20:20:52.4999027Z", - "dateUpdated": "2021-10-15T18:29:56.3490051Z", - "dateLastUpdateAttempted": "2021-10-15T18:29:56.3490051Z", + "dateUpdated": "2021-10-25T18:00:01.7786067Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:01.7786067Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -6147,14 +6179,14 @@ "addonID": 358304, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3466137, - "displayName": "logprot-1.16-1.4.jar", - "fileName": "logprot-1.16-1.4.jar", - "fileDate": "2021-09-19T18:52:57.91Z", - "fileLength": 13106, + "id": 3497459, + "displayName": "logprot-1.16-1.5.jar", + "fileName": "logprot-1.16-1.5.jar", + "fileDate": "2021-10-20T21:41:24.78Z", + "fileLength": 12244, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3466/137/logprot-1.16-1.4.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3497/459/logprot-1.16-1.5.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -6162,42 +6194,54 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 3534896497, - "type": 0, + "fingerprint": 3521857394, + "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 3002930837, - "type": 0, + "fingerprint": 2765705229, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 3543142243, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 82815321, + "packageFingerprint": 1526460411, "gameVersion": [ - "1.16.5", - "Forge" + "1.16.5" + ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + } ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, - "gameVersionDateReleased": "2019-08-01T00:00:00Z", - "gameId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2548535, + "projectId": 358304, + "packageFingerprintId": 766749685, + "gameVersionDateReleased": "2021-01-15T14:14:48.91Z", + "gameVersionMappingId": 3398871, + "gameVersionId": 8203, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "logprot-1.16-1.4.jar" + "FileNameOnDisk": "logprot-1.16-1.5.jar" }, "dateInstalled": "2021-07-05T20:20:52.541392Z", - "dateUpdated": "2021-09-21T13:07:09.7668739Z", - "dateLastUpdateAttempted": "2021-09-21T13:07:09.7668739Z", + "dateUpdated": "2021-10-25T18:00:50.528941Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:50.528941Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -6404,35 +6448,35 @@ "addonID": 284497, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3375360, - "displayName": "IronJetpacks-1.16.5-4.2.1.jar", - "fileName": "IronJetpacks-1.16.5-4.2.1.jar", - "fileDate": "2021-07-03T20:36:49.973Z", - "fileLength": 122608, + "id": 3507868, + "displayName": "IronJetpacks-1.16.5-4.2.2.jar", + "fileName": "IronJetpacks-1.16.5-4.2.2.jar", + "fileDate": "2021-10-29T00:09:50.823Z", + "fileLength": 122432, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3375/360/IronJetpacks-1.16.5-4.2.1.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3507/868/IronJetpacks-1.16.5-4.2.2.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 67947082, + "id": 76996236, "addonId": 272335, "type": 3, - "fileId": 3375360 + "fileId": 3507868 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 41589344, + "fingerprint": 1442922138, "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 3575232724, + "fingerprint": 1401039583, "type": 3, "invalidFingerprint": false }, @@ -6455,7 +6499,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 3428496331, + "packageFingerprint": 1036887502, "gameVersion": [ "1.16.5", "Forge" @@ -6466,14 +6510,14 @@ "gameVersion": "1.16.5", "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", "gameVersionName": "1.16.5", - "gameVersionTypeId": 0 + "gameVersionTypeId": 70886 }, { "gameVersionPadded": "0", "gameVersion": "", "gameVersionReleaseDate": "2019-08-01T00:00:00Z", "gameVersionName": "Forge", - "gameVersionTypeId": 0 + "gameVersionTypeId": 68441 } ], "hasInstallScript": false, @@ -6481,19 +6525,19 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2392113, + "renderCacheId": 2561380, "projectId": 284497, - "packageFingerprintId": 697743597, + "packageFingerprintId": 772544539, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 3099650, + "gameVersionMappingId": 3421421, "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "IronJetpacks-1.16.5-4.2.1.jar" + "FileNameOnDisk": "IronJetpacks-1.16.5-4.2.2.jar" }, "dateInstalled": "2021-07-05T20:19:25.2969373Z", - "dateUpdated": "2021-07-05T20:19:25.2969373Z", - "dateLastUpdateAttempted": "0001-01-01T00:00:00", + "dateUpdated": "2021-10-30T18:18:08.6999722Z", + "dateLastUpdateAttempted": "2021-10-30T18:18:08.6999722Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -6509,14 +6553,14 @@ "addonID": 470193, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3434629, - "displayName": "connectivity-2.3-1.16.5.jar", - "fileName": "connectivity-2.3-1.16.5.jar", - "fileDate": "2021-08-22T16:28:01.37Z", - "fileLength": 52995, + "id": 3510357, + "displayName": "connectivity-2.4-1.16.5.jar", + "fileName": "connectivity-2.4-1.16.5.jar", + "fileDate": "2021-10-31T11:56:15.68Z", + "fileLength": 53113, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3434/629/connectivity-2.3-1.16.5.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3510/357/connectivity-2.4-1.16.5.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -6524,58 +6568,91 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 2523172629, - "type": 0, + "fingerprint": 683154121, + "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 3844341493, - "type": 0, + "fingerprint": 470136606, + "type": 3, "invalidFingerprint": false }, { "foldername": "connectivity.mixins.json", "fingerprint": 2519663344, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 2098059805, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "connectivity.refmap.json", "fingerprint": 2808845358, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 2769176009, + "packageFingerprint": 1363992142, "gameVersion": [ "1.16.3", "1.16.5", - "Forge", "1.16.4", "1.16.2" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000003", + "gameVersion": "1.16.3", + "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z", + "gameVersionName": "1.16.3", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000004", + "gameVersion": "1.16.4", + "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", + "gameVersionName": "1.16.4", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000002", + "gameVersion": "1.16.2", + "gameVersionReleaseDate": "2020-08-11T16:42:21.863Z", + "gameVersionName": "1.16.2", + "gameVersionTypeId": 70886 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, - "gameVersionDateReleased": "2019-08-01T00:00:00Z", - "gameId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2564678, + "projectId": 470193, + "packageFingerprintId": 774232169, + "gameVersionDateReleased": "2020-08-11T16:42:21.863Z", + "gameVersionMappingId": 3428090, + "gameVersionId": 8010, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "connectivity-2.3-1.16.5.jar" + "FileNameOnDisk": "connectivity-2.4-1.16.5.jar" }, "dateInstalled": "2021-08-05T20:27:46.9347015Z", - "dateUpdated": "2021-08-25T05:56:37.7755052Z", - "dateLastUpdateAttempted": "2021-08-25T05:56:37.7755052Z", - "status": 5, + "dateUpdated": "2021-11-01T18:10:56.1021811Z", + "dateLastUpdateAttempted": "2021-11-01T18:10:56.1021811Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -7160,59 +7237,59 @@ "addonID": 412082, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3493463, - "displayName": "supplementaries-1.16.5-0.17.6.jar", - "fileName": "supplementaries-1.16.5-0.17.6.jar", - "fileDate": "2021-10-17T00:22:14.05Z", - "fileLength": 12099519, + "id": 3505596, + "displayName": "supplementaries-1.16.5-0.17.7.jar", + "fileName": "supplementaries-1.16.5-0.17.7.jar", + "fileDate": "2021-10-26T17:16:18.397Z", + "fileLength": 12233829, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3493/463/supplementaries-1.16.5-0.17.6.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3505/596/supplementaries-1.16.5-0.17.7.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 75995547, - "addonId": 486392, - "type": 2, - "fileId": 3493463 + "id": 76809357, + "addonId": 499980, + "type": 3, + "fileId": 3505596 }, { - "id": 75995544, + "id": 76809353, "addonId": 243121, "type": 2, - "fileId": 3493463 + "fileId": 3505596 }, { - "id": 75995546, + "id": 76809355, "addonId": 457570, "type": 2, - "fileId": 3493463 + "fileId": 3505596 }, { - "id": 75995548, - "addonId": 499980, - "type": 3, - "fileId": 3493463 + "id": 76809354, + "addonId": 284007, + "type": 2, + "fileId": 3505596 }, { - "id": 75995545, - "addonId": 284007, + "id": 76809356, + "addonId": 486392, "type": 2, - "fileId": 3493463 + "fileId": 3505596 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 3927160595, + "fingerprint": 1791225413, "type": 3, "invalidFingerprint": false }, { "foldername": "net", - "fingerprint": 1016092475, + "fingerprint": 2201390511, "type": 3, "invalidFingerprint": false }, @@ -7224,13 +7301,13 @@ }, { "foldername": "assets", - "fingerprint": 3766852348, + "fingerprint": 855348893, "type": 3, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 1843143962, + "fingerprint": 4074148857, "type": 3, "invalidFingerprint": false }, @@ -7248,18 +7325,18 @@ }, { "foldername": "supplementaries.mixins.json", - "fingerprint": 2628916953, + "fingerprint": 970020684, "type": 3, "invalidFingerprint": false }, { "foldername": "supplementaries.refmap.json", - "fingerprint": 4281158774, + "fingerprint": 3695146361, "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 4122961779, + "packageFingerprint": 2673931494, "gameVersion": [ "1.16.3", "1.16.5", @@ -7301,20 +7378,20 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2543311, + "renderCacheId": 2558458, "projectId": 412082, - "packageFingerprintId": 763821660, + "packageFingerprintId": 770882513, "gameVersionDateReleased": "2019-08-01T00:00:00Z", - "gameVersionMappingId": 3388295, + "gameVersionMappingId": 3415612, "gameVersionId": 7498, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "supplementaries-1.16.5-0.17.6.jar" + "FileNameOnDisk": "supplementaries-1.16.5-0.17.7.jar" }, "dateInstalled": "2021-08-11T21:22:43.3270429Z", - "dateUpdated": "2021-10-20T17:46:10.7380489Z", - "dateLastUpdateAttempted": "2021-10-20T17:46:10.7380489Z", - "status": 4, + "dateUpdated": "2021-10-27T17:18:47.0671406Z", + "dateLastUpdateAttempted": "2021-10-27T17:18:47.0671406Z", + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -7577,7 +7654,7 @@ "dateInstalled": "2021-07-05T20:20:54.9228218Z", "dateUpdated": "2021-10-20T17:46:42.4570492Z", "dateLastUpdateAttempted": "2021-10-20T17:46:42.4570492Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -7592,41 +7669,41 @@ "addonID": 521714, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3494772, - "displayName": "ponderjs-1.16.5-1.0.3a.jar", - "fileName": "ponderjs-1.16.5-1.0.3a.jar", - "fileDate": "2021-10-18T00:37:34.55Z", - "fileLength": 60120, + "id": 3511292, + "displayName": "ponderjs-1.16.5-1.0.3c.jar", + "fileName": "ponderjs-1.16.5-1.0.3c.jar", + "fileDate": "2021-11-01T05:52:18.837Z", + "fileLength": 60163, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3494/772/ponderjs-1.16.5-1.0.3a.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3511/292/ponderjs-1.16.5-1.0.3c.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 76094772, + "id": 77265346, "addonId": 238086, "type": 3, - "fileId": 3494772 + "fileId": 3511292 }, { - "id": 76094771, + "id": 77265345, "addonId": 328085, "type": 3, - "fileId": 3494772 + "fileId": 3511292 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 1132574012, + "fingerprint": 528353438, "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 3885943689, + "fingerprint": 1883754345, "type": 3, "invalidFingerprint": false }, @@ -7649,9 +7726,10 @@ "invalidFingerprint": false } ], - "packageFingerprint": 3064542389, + "packageFingerprint": 1199303587, "gameVersion": [ - "1.16.5" + "1.16.5", + "Forge" ], "sortableGameVersion": [ { @@ -7660,6 +7738,13 @@ "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", "gameVersionName": "1.16.5", "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 } ], "hasInstallScript": false, @@ -7667,19 +7752,19 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2545028, + "renderCacheId": 2565884, "projectId": 521714, - "packageFingerprintId": 764798096, + "packageFingerprintId": 774856656, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 3391805, + "gameVersionMappingId": 3430701, "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "ponderjs-1.16.5-1.0.3a.jar" + "FileNameOnDisk": "ponderjs-1.16.5-1.0.3c.jar" }, - "dateInstalled": "2021-09-01T20:23:23.4515179Z", - "dateUpdated": "2021-10-20T17:46:08.6745301Z", - "dateLastUpdateAttempted": "2021-10-20T17:46:08.6745301Z", + "dateInstalled": "2021-11-01T05:47:25.104157Z", + "dateUpdated": "2021-11-01T18:19:12.7862658Z", + "dateLastUpdateAttempted": "2021-11-01T18:19:12.7862658Z", "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -9418,113 +9503,133 @@ "addonID": 295910, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3484112, - "displayName": "IntegratedTerminals-1.16.5-1.2.7.jar", - "fileName": "IntegratedTerminals-1.16.5-1.2.7.jar", - "fileDate": "2021-10-07T16:46:32.49Z", - "fileLength": 473939, + "id": 3511617, + "displayName": "IntegratedTerminals-1.16.5-1.2.9.jar", + "fileName": "IntegratedTerminals-1.16.5-1.2.9.jar", + "fileDate": "2021-11-01T14:43:18.307Z", + "fileLength": 475025, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3484/112/IntegratedTerminals-1.16.5-1.2.7.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3511/617/IntegratedTerminals-1.16.5-1.2.9.jar", "isAlternate": false, - "alternateFileId": 3484113, + "alternateFileId": 3511618, "dependencies": [ { - "id": 0, - "addonId": 287357, - "type": 2, - "fileId": 0 + "id": 77290032, + "addonId": 251389, + "type": 3, + "fileId": 3511617 }, { - "id": 0, - "addonId": 232758, + "id": 77290030, + "addonId": 236307, "type": 3, - "fileId": 0 + "fileId": 3511617 }, { - "id": 0, - "addonId": 251389, + "id": 77290033, + "addonId": 232758, "type": 3, - "fileId": 0 + "fileId": 3511617 }, { - "id": 0, - "addonId": 236307, - "type": 3, - "fileId": 0 + "id": 77290031, + "addonId": 287357, + "type": 2, + "fileId": 3511617 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 1244823680, - "type": 0, + "fingerprint": 503445326, + "type": 3, "invalidFingerprint": false }, { "foldername": "org", - "fingerprint": 1118703486, - "type": 0, + "fingerprint": 268877904, + "type": 3, "invalidFingerprint": false }, { "foldername": "logo.png", "fingerprint": 2877892280, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "logo_small.png", "fingerprint": 18908756, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 1782312737, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", "fingerprint": 191223691, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "data", "fingerprint": 2441444065, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "mcmod.info", "fingerprint": 36295578, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 2735166207, + "packageFingerprint": 1442739040, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2566303, + "projectId": 295910, + "packageFingerprintId": 775053086, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3431541, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "IntegratedTerminals-1.16.5-1.2.7.jar" + "FileNameOnDisk": "IntegratedTerminals-1.16.5-1.2.9.jar" }, "dateInstalled": "2021-07-05T20:20:54.9328256Z", - "dateUpdated": "2021-10-09T17:57:41.3355848Z", - "dateLastUpdateAttempted": "2021-10-09T17:57:41.3355848Z", - "status": 5, + "dateUpdated": "2021-11-01T18:19:26.5061512Z", + "dateLastUpdateAttempted": "2021-11-01T18:19:26.5061512Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -9949,7 +10054,7 @@ "dateInstalled": "2021-07-05T20:19:25.2949358Z", "dateUpdated": "2021-10-20T17:46:31.8664811Z", "dateLastUpdateAttempted": "2021-10-20T17:46:31.8664811Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -10318,41 +10423,41 @@ "addonID": 298187, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3205295, - "displayName": "buildinggadgets-1.16.5-3.8.0.jar", - "fileName": "buildinggadgets-1.16.5-3.8.0.jar", - "fileDate": "2021-02-15T19:42:19.863Z", - "fileLength": 909445, + "id": 3498508, + "displayName": "buildinggadgets-1.16.5-3.8.2.jar", + "fileName": "buildinggadgets-1.16.5-3.8.2.jar", + "fileDate": "2021-10-21T21:58:01.393Z", + "fileLength": 912083, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3205/295/buildinggadgets-1.16.5-3.8.0.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3498/508/buildinggadgets-1.16.5-3.8.2.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 56916937, + "id": 76387612, "addonId": 399757, "type": 2, - "fileId": 3205295 + "fileId": 3498508 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 267054609, + "fingerprint": 216102098, "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 962286206, + "fingerprint": 2043791850, "type": 3, "invalidFingerprint": false }, { - "foldername": "data", - "fingerprint": 597267807, + "foldername": "assets", + "fingerprint": 3840510572, "type": 3, "invalidFingerprint": false }, @@ -10363,8 +10468,8 @@ "invalidFingerprint": false }, { - "foldername": "assets", - "fingerprint": 3840510572, + "foldername": "data", + "fingerprint": 597267807, "type": 3, "invalidFingerprint": false }, @@ -10375,9 +10480,10 @@ "invalidFingerprint": false } ], - "packageFingerprint": 3456565023, + "packageFingerprint": 3980463159, "gameVersion": [ - "1.16.5" + "1.16.5", + "Forge" ], "sortableGameVersion": [ { @@ -10385,7 +10491,14 @@ "gameVersion": "1.16.5", "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", "gameVersionName": "1.16.5", - "gameVersionTypeId": 0 + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 } ], "hasInstallScript": false, @@ -10393,19 +10506,19 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2173986, + "renderCacheId": 2549865, "projectId": 298187, - "packageFingerprintId": 606375272, + "packageFingerprintId": 767511696, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 2725255, + "gameVersionMappingId": 3401733, "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "buildinggadgets-1.16.5-3.8.0.jar" + "FileNameOnDisk": "buildinggadgets-1.16.5-3.8.2.jar" }, "dateInstalled": "2021-07-05T20:20:57.5145815Z", - "dateUpdated": "2021-07-05T20:20:57.5145815Z", - "dateLastUpdateAttempted": "0001-01-01T00:00:00", + "dateUpdated": "2021-10-25T18:02:01.284463Z", + "dateLastUpdateAttempted": "2021-10-25T18:02:01.284463Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -10421,14 +10534,14 @@ "addonID": 280294, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3419933, - "displayName": "FpsReducer-forge-1.23-mc1.16.5.jar", - "fileName": "FpsReducer-forge-1.23-mc1.16.5.jar", - "fileDate": "2021-08-09T07:30:22.947Z", - "fileLength": 94947, + "id": 3510435, + "displayName": "FpsReducer-forge-1.24-mc1.16.5.jar", + "fileName": "FpsReducer-forge-1.24-mc1.16.5.jar", + "fileDate": "2021-10-31T13:24:31.633Z", + "fileLength": 95076, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3419/933/FpsReducer-forge-1.23-mc1.16.5.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3510/435/FpsReducer-forge-1.24-mc1.16.5.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -10436,67 +10549,87 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 3083225176, - "type": 0, + "fingerprint": 2238369096, + "type": 3, "invalidFingerprint": false }, { "foldername": "bre2el", - "fingerprint": 305118122, - "type": 0, + "fingerprint": 993665307, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", "fingerprint": 2163027845, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "fpsreducer.mixins.json", "fingerprint": 1828560234, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "fpsreducer_logo.png", "fingerprint": 2600135182, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 419585142, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "fpsreducer.refmap.json", "fingerprint": 4067606497, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 2329459138, + "packageFingerprint": 1219284137, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2564779, + "projectId": 280294, + "packageFingerprintId": 774271386, "gameVersionDateReleased": "2019-08-01T00:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3428362, + "gameVersionId": 7498, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "FpsReducer-forge-1.23-mc1.16.5.jar" + "FileNameOnDisk": "FpsReducer-forge-1.24-mc1.16.5.jar" }, "dateInstalled": "2021-07-05T20:20:57.5105817Z", - "dateUpdated": "2021-08-10T16:56:56.9930877Z", - "dateLastUpdateAttempted": "2021-08-10T16:56:56.9930877Z", - "status": 5, + "dateUpdated": "2021-11-01T18:10:53.9315046Z", + "dateLastUpdateAttempted": "2021-11-01T18:10:53.9315046Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -10636,47 +10769,47 @@ "addonID": 231095, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3493219, - "displayName": "chiselsandbits-1.0.42-ALPHA.jar", - "fileName": "chiselsandbits-1.0.42-ALPHA.jar", - "fileDate": "2021-10-16T20:04:49.603Z", - "fileLength": 1330531, - "releaseType": 3, + "id": 3510598, + "displayName": "chiselsandbits-1.0.43.jar", + "fileName": "chiselsandbits-1.0.43.jar", + "fileDate": "2021-10-31T15:39:00.287Z", + "fileLength": 1287291, + "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3493/219/chiselsandbits-1.0.42-ALPHA.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3510/598/chiselsandbits-1.0.43.jar", "isAlternate": false, - "alternateFileId": 3493220, + "alternateFileId": 3510599, "dependencies": [ { - "id": 75979212, + "id": 77204671, "addonId": 238222, "type": 2, - "fileId": 3493219 + "fileId": 3510598 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 924961052, + "fingerprint": 3287507274, "type": 3, "invalidFingerprint": false }, { "foldername": "mod", - "fingerprint": 437364770, + "fingerprint": 3595498291, "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 2774545476, + "fingerprint": 32808345, "type": 3, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 2330824587, + "fingerprint": 2804025003, "type": 3, "invalidFingerprint": false }, @@ -10693,7 +10826,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 3190745712, + "packageFingerprint": 1779439035, "gameVersion": [ "1.16.3", "1.16.5", @@ -10743,19 +10876,19 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2542978, + "renderCacheId": 2564981, "projectId": 231095, - "packageFingerprintId": 763709515, + "packageFingerprintId": 774359896, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 3387755, + "gameVersionMappingId": 3428745, "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "chiselsandbits-1.0.42-ALPHA.jar" + "FileNameOnDisk": "chiselsandbits-1.0.43.jar" }, "dateInstalled": "2021-09-24T18:21:26.2309502Z", - "dateUpdated": "2021-10-20T17:46:41.9483719Z", - "dateLastUpdateAttempted": "2021-10-20T17:46:41.9483719Z", + "dateUpdated": "2021-11-01T18:01:31.1440443Z", + "dateLastUpdateAttempted": "2021-11-01T18:01:31.1440443Z", "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -11260,14 +11393,14 @@ "addonID": 378802, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3268432, - "displayName": "Structure Gel 1.16.5-v1.7.7", - "fileName": "structure_gel-1.16.5-1.7.7.jar", - "fileDate": "2021-04-07T17:23:38.58Z", - "fileLength": 260027, + "id": 3498310, + "displayName": "Structure Gel 1.16.5-v1.7.8", + "fileName": "structure_gel-1.16.5-1.7.8.jar", + "fileDate": "2021-10-21T18:17:37.803Z", + "fileLength": 261390, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3268/432/structure_gel-1.16.5-1.7.7.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3498/310/structure_gel-1.16.5-1.7.8.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -11275,13 +11408,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 3699027761, + "fingerprint": 2443688123, "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 544735032, + "fingerprint": 1185170382, "type": 3, "invalidFingerprint": false }, @@ -11293,7 +11426,7 @@ }, { "foldername": "assets", - "fingerprint": 2942120461, + "fingerprint": 1807711076, "type": 3, "invalidFingerprint": false }, @@ -11328,9 +11461,10 @@ "invalidFingerprint": false } ], - "packageFingerprint": 1576729289, + "packageFingerprint": 1658340665, "gameVersion": [ - "1.16.5" + "1.16.5", + "Forge" ], "sortableGameVersion": [ { @@ -11338,7 +11472,14 @@ "gameVersion": "1.16.5", "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", "gameVersionName": "1.16.5", - "gameVersionTypeId": 0 + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 } ], "hasInstallScript": false, @@ -11346,19 +11487,19 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2255538, + "renderCacheId": 2549615, "projectId": 378802, - "packageFingerprintId": 639962308, - "gameVersionDateReleased": "2021-01-15T14:14:48.91Z", - "gameVersionMappingId": 2849789, - "gameVersionId": 8203, + "packageFingerprintId": 767341787, + "gameVersionDateReleased": "2019-08-01T00:00:00Z", + "gameVersionMappingId": 3401214, + "gameVersionId": 7498, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "structure_gel-1.16.5-1.7.7.jar" + "FileNameOnDisk": "structure_gel-1.16.5-1.7.8.jar" }, "dateInstalled": "2021-07-05T20:20:57.5275809Z", - "dateUpdated": "2021-07-05T20:20:57.5275809Z", - "dateLastUpdateAttempted": "0001-01-01T00:00:00", + "dateUpdated": "2021-10-25T18:01:53.795125Z", + "dateLastUpdateAttempted": "2021-10-25T18:01:53.795125Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -12592,52 +12733,52 @@ "addonID": 289412, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3492764, - "displayName": "ftb-quests-forge-1605.3.5-build.69.jar", - "fileName": "ftb-quests-forge-1605.3.5-build.69.jar", - "fileDate": "2021-10-16T12:34:13.243Z", - "fileLength": 937093, + "id": 3498398, + "displayName": "ftb-quests-forge-1605.3.5-build.72.jar", + "fileName": "ftb-quests-forge-1605.3.5-build.72.jar", + "fileDate": "2021-10-21T19:43:41.687Z", + "fileLength": 937588, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3492/764/ftb-quests-forge-1605.3.5-build.69.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3498/398/ftb-quests-forge-1605.3.5-build.72.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 75946846, + "id": 76376609, + "addonId": 309674, + "type": 3, + "fileId": 3498398 + }, + { + "id": 76376605, "addonId": 404465, "type": 3, - "fileId": 3492764 + "fileId": 3498398 }, { - "id": 75946850, - "addonId": 309674, + "id": 76376606, + "addonId": 419699, "type": 3, - "fileId": 3492764 + "fileId": 3498398 }, { - "id": 75946851, + "id": 76376610, "addonId": 238222, "type": 2, - "fileId": 3492764 - }, - { - "id": 75946847, - "addonId": 419699, - "type": 3, - "fileId": 3492764 + "fileId": 3498398 }, { - "id": 75946848, + "id": 76376607, "addonId": 238086, "type": 2, - "fileId": 3492764 + "fileId": 3498398 }, { - "id": 75946849, + "id": 76376608, "addonId": 404468, "type": 3, - "fileId": 3492764 + "fileId": 3498398 } ], "isAvailable": true, @@ -12668,24 +12809,24 @@ }, { "foldername": "META-INF", - "fingerprint": 2441441963, + "fingerprint": 1867212963, "type": 3, "invalidFingerprint": false }, { "foldername": "dev", - "fingerprint": 3769466285, + "fingerprint": 2939400894, "type": 3, "invalidFingerprint": false }, { - "foldername": "architectury_inject_FTBQuests1165_common_e3444670e5e84dcb9940c1f526c24cbf", - "fingerprint": 881217292, + "foldername": "architectury_inject_FTBQuests1165_common_cba8e5b833a34d0ca17987e095886b92", + "fingerprint": 813913393, "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 1564502373, + "packageFingerprint": 4179220620, "gameVersion": [ "1.16.5", "Forge" @@ -12711,20 +12852,20 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2542354, + "renderCacheId": 2549728, "projectId": 289412, - "packageFingerprintId": 763453335, + "packageFingerprintId": 767403616, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 3386443, + "gameVersionMappingId": 3401457, "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "ftb-quests-forge-1605.3.5-build.69.jar" + "FileNameOnDisk": "ftb-quests-forge-1605.3.5-build.72.jar" }, "dateInstalled": "2021-07-05T20:20:57.5375822Z", - "dateUpdated": "2021-10-20T17:46:29.1197176Z", - "dateLastUpdateAttempted": "2021-10-20T17:46:29.1197176Z", - "status": 4, + "dateUpdated": "2021-10-25T18:00:17.4311452Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:17.4311452Z", + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -12739,94 +12880,114 @@ "addonID": 251389, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3443979, - "displayName": "IntegratedTunnels-1.16.5-1.8.6.jar", - "fileName": "IntegratedTunnels-1.16.5-1.8.6.jar", - "fileDate": "2021-08-30T17:31:12.17Z", - "fileLength": 591666, + "id": 3498295, + "displayName": "IntegratedTunnels-1.16.5-1.8.7.jar", + "fileName": "IntegratedTunnels-1.16.5-1.8.7.jar", + "fileDate": "2021-10-21T18:05:21.243Z", + "fileLength": 591631, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3443/979/IntegratedTunnels-1.16.5-1.8.6.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3498/295/IntegratedTunnels-1.16.5-1.8.7.jar", "isAlternate": false, - "alternateFileId": 3443980, + "alternateFileId": 3498296, "dependencies": [ { - "id": 0, + "id": 76367019, "addonId": 232758, "type": 3, - "fileId": 0 + "fileId": 3498295 }, { - "id": 0, + "id": 76367018, "addonId": 236307, "type": 3, - "fileId": 0 + "fileId": 3498295 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 2091418331, - "type": 0, + "fingerprint": 236862701, + "type": 3, "invalidFingerprint": false }, { "foldername": "org", - "fingerprint": 170040213, - "type": 0, + "fingerprint": 477097904, + "type": 3, "invalidFingerprint": false }, { - "foldername": "pack.mcmeta", - "fingerprint": 4044870590, - "type": 0, + "foldername": "logo.png", + "fingerprint": 152818033, + "type": 3, "invalidFingerprint": false }, { - "foldername": "assets", - "fingerprint": 3961494986, - "type": 0, + "foldername": "logo_small.png", + "fingerprint": 3667489292, + "type": 3, "invalidFingerprint": false }, { - "foldername": "logo_small.png", - "fingerprint": 3667489292, - "type": 0, + "foldername": "pack.mcmeta", + "fingerprint": 4044870590, + "type": 3, "invalidFingerprint": false }, { - "foldername": "logo.png", - "fingerprint": 152818033, - "type": 0, + "foldername": "assets", + "fingerprint": 3961494986, + "type": 3, "invalidFingerprint": false }, { "foldername": "data", "fingerprint": 2522231078, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 1525529218, + "packageFingerprint": 3859486610, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2549599, + "projectId": 251389, + "packageFingerprintId": 767337662, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3401170, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "IntegratedTunnels-1.16.5-1.8.6.jar" + "FileNameOnDisk": "IntegratedTunnels-1.16.5-1.8.7.jar" }, "dateInstalled": "2021-07-05T20:19:25.2909342Z", - "dateUpdated": "2021-08-31T18:22:25.6272784Z", - "dateLastUpdateAttempted": "2021-08-31T18:22:25.6272784Z", + "dateUpdated": "2021-10-25T18:00:43.0407268Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:43.0407268Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -12920,14 +13081,14 @@ "addonID": 416935, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3490931, - "displayName": "Valhelsia Core - 16.0.12", - "fileName": "valhelsia_core-16.0.12.jar", - "fileDate": "2021-10-14T14:47:59.443Z", - "fileLength": 149437, + "id": 3508441, + "displayName": "Valhelsia Core - 16.0.13a", + "fileName": "valhelsia_core-16.0.13a.jar", + "fileDate": "2021-10-29T15:52:51.37Z", + "fileLength": 601128, "releaseType": 2, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3490/931/valhelsia_core-16.0.12.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3508/441/valhelsia_core-16.0.13a.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -12935,19 +13096,19 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 193452692, + "fingerprint": 4179973337, "type": 3, "invalidFingerprint": false }, { "foldername": "net", - "fingerprint": 151474470, + "fingerprint": 2135605802, "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 1275515862, + "fingerprint": 3307001340, "type": 3, "invalidFingerprint": false }, @@ -12959,20 +13120,21 @@ }, { "foldername": "valhelsia_core.mixins.json", - "fingerprint": 2846435592, + "fingerprint": 2704765058, "type": 3, "invalidFingerprint": false }, { "foldername": "valhelsia_core.refmap.json", - "fingerprint": 3069778118, + "fingerprint": 2773714771, "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 3381729081, + "packageFingerprint": 2324193014, "gameVersion": [ - "1.16.5" + "1.16.5", + "Forge" ], "sortableGameVersion": [ { @@ -12980,7 +13142,14 @@ "gameVersion": "1.16.5", "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", "gameVersionName": "1.16.5", - "gameVersionTypeId": 0 + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 } ], "hasInstallScript": false, @@ -12988,19 +13157,19 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2540003, + "renderCacheId": 2562134, "projectId": 416935, - "packageFingerprintId": 762172181, - "gameVersionDateReleased": "2021-01-15T14:14:48.91Z", - "gameVersionMappingId": 3381669, - "gameVersionId": 8203, + "packageFingerprintId": 772911939, + "gameVersionDateReleased": "2008-03-01T06:00:00Z", + "gameVersionMappingId": 3423087, + "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "valhelsia_core-16.0.12.jar" + "FileNameOnDisk": "valhelsia_core-16.0.13a.jar" }, "dateInstalled": "2021-07-05T20:20:57.5175818Z", - "dateUpdated": "2021-10-15T19:26:00.975094Z", - "dateLastUpdateAttempted": "2021-10-15T19:26:00.975094Z", + "dateUpdated": "2021-10-30T18:18:04.076355Z", + "dateLastUpdateAttempted": "2021-10-30T18:18:04.076355Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -13316,41 +13485,41 @@ "addonID": 361026, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3496016, - "displayName": "occultism-1.17.2.jar", - "fileName": "occultism-1.16.5-1.17.2.jar", - "fileDate": "2021-10-19T08:54:52.71Z", - "fileLength": 4367756, + "id": 3511736, + "displayName": "occultism-1.18.0.jar", + "fileName": "occultism-1.16.5-1.18.0.jar", + "fileDate": "2021-11-01T16:38:51.043Z", + "fileLength": 4436583, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3496/16/occultism-1.16.5-1.17.2.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3511/736/occultism-1.16.5-1.18.0.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 76195737, - "addonId": 306770, + "id": 77298280, + "addonId": 309927, "type": 3, - "fileId": 3496016 + "fileId": 3511736 }, { - "id": 76195738, - "addonId": 309927, + "id": 77298279, + "addonId": 306770, "type": 3, - "fileId": 3496016 + "fileId": 3511736 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 4008397877, + "fingerprint": 1507892666, "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 2473552748, + "fingerprint": 2168774345, "type": 3, "invalidFingerprint": false }, @@ -13368,18 +13537,18 @@ }, { "foldername": "assets", - "fingerprint": 1994858859, + "fingerprint": 958961182, "type": 3, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 1694261068, + "fingerprint": 2778681191, "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 1712495412, + "packageFingerprint": 2481334143, "gameVersion": [ "1.16.3", "1.16.5", @@ -13429,19 +13598,19 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2546639, + "renderCacheId": 2566462, "projectId": 361026, - "packageFingerprintId": 765587144, + "packageFingerprintId": 775125313, "gameVersionDateReleased": "2019-08-01T00:00:00Z", - "gameVersionMappingId": 3395052, + "gameVersionMappingId": 3431900, "gameVersionId": 7498, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "occultism-1.16.5-1.17.2.jar" + "FileNameOnDisk": "occultism-1.16.5-1.18.0.jar" }, "dateInstalled": "2021-09-25T14:41:32.7416314Z", - "dateUpdated": "2021-10-20T17:46:22.5223981Z", - "dateLastUpdateAttempted": "2021-10-20T17:46:22.5223981Z", + "dateUpdated": "2021-11-01T18:19:17.3655669Z", + "dateLastUpdateAttempted": "2021-11-01T18:19:17.3655669Z", "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -14655,14 +14824,14 @@ "addonID": 441647, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3480743, - "displayName": "FramedBlocks-2.11.0.jar", - "fileName": "FramedBlocks-2.11.0.jar", - "fileDate": "2021-10-03T23:56:39.877Z", - "fileLength": 569942, + "id": 3499681, + "displayName": "FramedBlocks-2.11.1-hotfix.jar", + "fileName": "FramedBlocks-2.11.1.jar", + "fileDate": "2021-10-23T00:39:35.993Z", + "fileLength": 570251, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3480/743/FramedBlocks-2.11.0.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3499/681/FramedBlocks-2.11.1.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -14670,84 +14839,104 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 3258375913, - "type": 0, + "fingerprint": 3896331040, + "type": 3, "invalidFingerprint": false }, { "foldername": "team", "fingerprint": 1322605695, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "xfacthd", - "fingerprint": 3416463902, - "type": 0, + "fingerprint": 480968839, + "type": 3, "invalidFingerprint": false }, { "foldername": ".cache", "fingerprint": 1637966753, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", "fingerprint": 1004783936, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "data", "fingerprint": 204396418, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "framedblocks.mixin.json", "fingerprint": 4089559895, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "logo.png", "fingerprint": 789975261, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 3799552759, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "framedblocks.refmap.json", "fingerprint": 2490754047, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 871125421, + "packageFingerprint": 3171565000, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2551341, + "projectId": 441647, + "packageFingerprintId": 768239058, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3405038, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "FramedBlocks-2.11.0.jar" + "FileNameOnDisk": "FramedBlocks-2.11.1.jar" }, "dateInstalled": "2021-07-10T17:55:07.2563413Z", - "dateUpdated": "2021-10-04T17:58:56.9261501Z", - "dateLastUpdateAttempted": "2021-10-04T17:58:56.9261501Z", + "dateUpdated": "2021-10-25T18:00:54.8379355Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:54.8379355Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -14853,40 +15042,40 @@ "addonID": 238086, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3481251, - "displayName": "kubejs-forge-1605.3.18-build.144.jar", - "fileName": "kubejs-forge-1605.3.18-build.144.jar", - "fileDate": "2021-10-04T15:29:11.15Z", - "fileLength": 851611, + "id": 3498936, + "displayName": "kubejs-forge-1605.3.18-build.152.jar", + "fileName": "kubejs-forge-1605.3.18-build.152.jar", + "fileDate": "2021-10-22T11:38:44.66Z", + "fileLength": 857398, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3481/251/kubejs-forge-1605.3.18-build.144.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3498/936/kubejs-forge-1605.3.18-build.152.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 0, + "id": 76426193, "addonId": 268655, "type": 2, - "fileId": 0 + "fileId": 3498936 }, { - "id": 0, + "id": 76426191, "addonId": 416294, "type": 3, - "fileId": 0 + "fileId": 3498936 }, { - "id": 0, + "id": 76426194, "addonId": 238222, "type": 2, - "fileId": 0 + "fileId": 3498936 }, { - "id": 0, + "id": 76426192, "addonId": 419699, "type": 3, - "fileId": 0 + "fileId": 3498936 } ], "isAvailable": true, @@ -14894,96 +15083,123 @@ { "foldername": "data", "fingerprint": 3279136865, - "type": 0, + "type": 3, "invalidFingerprint": false }, { - "foldername": "kubejs-common.mixins.json", - "fingerprint": 2796111738, - "type": 0, + "foldername": "assets", + "fingerprint": 2083650698, + "type": 3, "invalidFingerprint": false }, { - "foldername": "assets", - "fingerprint": 2083650698, - "type": 0, + "foldername": "kubejs-common.mixins.json", + "fingerprint": 2796111738, + "type": 3, "invalidFingerprint": false }, { "foldername": "kubejs_logo.png", "fingerprint": 658118443, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "kubejs-common-refmap.json", "fingerprint": 2607262402, - "type": 0, + "type": 3, + "invalidFingerprint": false + }, + { + "foldername": "kubejs.mixins.json", + "fingerprint": 3372627309, + "type": 3, "invalidFingerprint": false }, { "foldername": "kubejs.plugins.txt", "fingerprint": 2117761820, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 1290654324, - "type": 0, - "invalidFingerprint": false - }, - { - "foldername": "kubejs.mixins.json", - "fingerprint": 3372627309, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "META-INF", - "fingerprint": 1661160531, - "type": 0, + "fingerprint": 3608767236, + "type": 3, "invalidFingerprint": false }, { "foldername": "dev", - "fingerprint": 3826522156, - "type": 0, + "fingerprint": 2296009990, + "type": 3, "invalidFingerprint": false }, { - "foldername": "architectury_inject_KubeJS1165_common_df75c6b7310947679014773671c5ed9a", - "fingerprint": 538915640, - "type": 0, + "foldername": "architectury_inject_KubeJS1165_common_5b01cc714d41426b88a61515a9ec9bcf", + "fingerprint": 933559580, + "type": 3, "invalidFingerprint": false }, { "foldername": "kubejs-forge-refmap.json", "fingerprint": 1493072104, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 2628864267, + "packageFingerprint": 975060467, "gameVersion": [ "1.16.5", "Forge", "1.16.4" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000004", + "gameVersion": "1.16.4", + "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", + "gameVersionName": "1.16.4", + "gameVersionTypeId": 70886 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2550425, + "projectId": 238086, + "packageFingerprintId": 767787239, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3402911, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "kubejs-forge-1605.3.18-build.144.jar" + "FileNameOnDisk": "kubejs-forge-1605.3.18-build.152.jar" }, "dateInstalled": "2021-09-28T18:08:09.9226898Z", - "dateUpdated": "2021-10-04T17:58:52.0071512Z", - "dateLastUpdateAttempted": "2021-10-04T17:58:52.0071512Z", + "dateUpdated": "2021-10-25T18:00:51.7959353Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:51.7959353Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -15103,14 +15319,14 @@ "addonID": 363363, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3483059, - "displayName": "Extreme Sound Muffler 3.16 - Forge 1.16.5", - "fileName": "extremeSoundMuffler-3.16_1.16.5.jar", - "fileDate": "2021-10-06T10:54:28.19Z", - "fileLength": 283454, + "id": 3506112, + "displayName": "Extreme Sound Muffler 3.17 - Forge 1.16.5", + "fileName": "extremeSoundMuffler-3.17_1.16.5.jar", + "fileDate": "2021-10-27T06:00:14.093Z", + "fileLength": 284548, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3483/59/extremeSoundMuffler-3.16_1.16.5.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3506/112/extremeSoundMuffler-3.17_1.16.5.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -15118,60 +15334,80 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 3601481315, - "type": 0, + "fingerprint": 2339713275, + "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 248376923, - "type": 0, + "fingerprint": 3113472407, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 2159168, - "type": 0, + "fingerprint": 2963132567, + "type": 3, "invalidFingerprint": false }, { "foldername": "esm_logo.png", "fingerprint": 1632690954, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 2066463772, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "extremesoundmuffler.refmap.json", "fingerprint": 823211581, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 331046537, + "packageFingerprint": 586800759, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2559142, + "projectId": 363363, + "packageFingerprintId": 771230755, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3416874, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "extremeSoundMuffler-3.16_1.16.5.jar" + "FileNameOnDisk": "extremeSoundMuffler-3.17_1.16.5.jar" }, "dateInstalled": "2021-07-05T20:21:03.3831197Z", - "dateUpdated": "2021-10-07T18:09:14.2795249Z", - "dateLastUpdateAttempted": "2021-10-07T18:09:14.2795249Z", + "dateUpdated": "2021-10-27T17:18:43.4434457Z", + "dateLastUpdateAttempted": "2021-10-27T17:18:43.4434457Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -15369,14 +15605,14 @@ "addonID": 267193, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3436684, - "displayName": "Chunk Pregenerator-V1.16-3.1.1", - "fileName": "Chunk Pregenerator-V1.16-3.1.1.jar", - "fileDate": "2021-08-23T17:48:03.24Z", - "fileLength": 443474, + "id": 3507658, + "displayName": "Chunk Pregenerator-V1.16-3.2.0", + "fileName": "Chunk Pregenerator-V1.16-3.2.0.jar", + "fileDate": "2021-10-28T18:50:55.59Z", + "fileLength": 444565, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3436/684/Chunk Pregenerator-V1.16-3.1.1.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3507/658/Chunk Pregenerator-V1.16-3.2.0.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -15384,41 +15620,54 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 453566642, - "type": 0, + "fingerprint": 1970508558, + "type": 3, "invalidFingerprint": false }, { "foldername": "pregenerator", - "fingerprint": 2918504312, - "type": 0, + "fingerprint": 137555938, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 1438559181, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 4213455804, + "packageFingerprint": 1092338180, "gameVersion": [ "1.16.5" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2561119, + "projectId": 267193, + "packageFingerprintId": 772396247, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3420817, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "Chunk Pregenerator-V1.16-3.1.1.jar" + "FileNameOnDisk": "Chunk Pregenerator-V1.16-3.2.0.jar" }, "dateInstalled": "2021-07-05T20:21:03.3721197Z", - "dateUpdated": "2021-08-25T05:56:33.1205011Z", - "dateLastUpdateAttempted": "2021-08-25T05:56:33.1205011Z", + "dateUpdated": "2021-10-30T18:18:11.3060176Z", + "dateLastUpdateAttempted": "2021-10-30T18:18:11.3060176Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -15625,100 +15874,120 @@ "addonID": 287357, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3482425, - "displayName": "IntegratedCrafting-1.16.5-1.0.18.jar", - "fileName": "IntegratedCrafting-1.16.5-1.0.18.jar", - "fileDate": "2021-10-05T18:15:00.473Z", - "fileLength": 265644, + "id": 3498285, + "displayName": "IntegratedCrafting-1.16.5-1.0.19.jar", + "fileName": "IntegratedCrafting-1.16.5-1.0.19.jar", + "fileDate": "2021-10-21T18:05:09.183Z", + "fileLength": 265741, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3482/425/IntegratedCrafting-1.16.5-1.0.18.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3498/285/IntegratedCrafting-1.16.5-1.0.19.jar", "isAlternate": false, - "alternateFileId": 3482426, + "alternateFileId": 3498286, "dependencies": [ { - "id": 0, + "id": 76367012, "addonId": 251389, "type": 3, - "fileId": 0 + "fileId": 3498285 }, { - "id": 0, + "id": 76367013, "addonId": 232758, "type": 3, - "fileId": 0 + "fileId": 3498285 }, { - "id": 0, + "id": 76367011, "addonId": 236307, "type": 3, - "fileId": 0 + "fileId": 3498285 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 2231806482, - "type": 0, + "fingerprint": 2634983720, + "type": 3, "invalidFingerprint": false }, { "foldername": "org", - "fingerprint": 793353792, - "type": 0, + "fingerprint": 1313612392, + "type": 3, "invalidFingerprint": false }, { - "foldername": "assets", - "fingerprint": 2126579824, - "type": 0, + "foldername": "logo.png", + "fingerprint": 3950789569, + "type": 3, + "invalidFingerprint": false + }, + { + "foldername": "logo_small.png", + "fingerprint": 1376710925, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 1296569065, - "type": 0, + "type": 3, "invalidFingerprint": false }, { - "foldername": "logo_small.png", - "fingerprint": 1376710925, - "type": 0, + "foldername": "assets", + "fingerprint": 2126579824, + "type": 3, "invalidFingerprint": false }, { "foldername": "data", "fingerprint": 3192681218, - "type": 0, - "invalidFingerprint": false - }, - { - "foldername": "logo.png", - "fingerprint": 3950789569, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 1057330700, + "packageFingerprint": 1016729108, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2549589, + "projectId": 287357, + "packageFingerprintId": 767332002, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3401140, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "IntegratedCrafting-1.16.5-1.0.18.jar" + "FileNameOnDisk": "IntegratedCrafting-1.16.5-1.0.19.jar" }, "dateInstalled": "2021-07-05T20:19:25.3039342Z", - "dateUpdated": "2021-10-06T16:58:22.0913521Z", - "dateLastUpdateAttempted": "2021-10-06T16:58:22.0913521Z", + "dateUpdated": "2021-10-25T18:00:31.0721469Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:31.0721469Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -16640,14 +16909,14 @@ "addonID": 238222, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3488178, - "displayName": "jei-1.16.5-7.7.1.126.jar", - "fileName": "jei-1.16.5-7.7.1.126.jar", - "fileDate": "2021-10-11T19:18:39.6Z", - "fileLength": 817187, + "id": 3502687, + "displayName": "jei-1.16.5-7.7.1.129.jar", + "fileName": "jei-1.16.5-7.7.1.129.jar", + "fileDate": "2021-10-24T21:18:33.717Z", + "fileLength": 814398, "releaseType": 2, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3488/178/jei-1.16.5-7.7.1.126.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3502/687/jei-1.16.5-7.7.1.129.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -16655,48 +16924,68 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 436666546, - "type": 0, + "fingerprint": 1895158786, + "type": 3, "invalidFingerprint": false }, { "foldername": "mezz", - "fingerprint": 1090284749, - "type": 0, + "fingerprint": 1852755441, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 1645019714, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 450215618, - "type": 0, + "fingerprint": 3320998644, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 3537995693, + "packageFingerprint": 1720764774, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2554986, + "projectId": 238222, + "packageFingerprintId": 769585941, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3409968, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "jei-1.16.5-7.7.1.126.jar" + "FileNameOnDisk": "jei-1.16.5-7.7.1.129.jar" }, "dateInstalled": "2021-10-04T19:00:56.2227538Z", - "dateUpdated": "2021-10-12T17:46:51.0921145Z", - "dateLastUpdateAttempted": "2021-10-12T17:46:51.0921145Z", + "dateUpdated": "2021-10-25T18:00:53.0069341Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:53.0069341Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -17431,90 +17720,124 @@ "addonID": 289712, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3468014, - "displayName": "tetra-1.16.5-3.17.0.jar", - "fileName": "tetra-1.16.5-3.17.0.jar", - "fileDate": "2021-09-21T23:14:09.977Z", - "fileLength": 2990458, + "id": 3506628, + "displayName": "tetra-1.16.5-3.18.0.jar", + "fileName": "tetra-1.16.5-3.18.0.jar", + "fileDate": "2021-10-27T17:28:27.027Z", + "fileLength": 2990480, "releaseType": 2, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3468/14/tetra-1.16.5-3.17.0.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3506/628/tetra-1.16.5-3.18.0.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 0, + "id": 76894887, "addonId": 351914, "type": 3, - "fileId": 0 + "fileId": 3506628 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 728194680, - "type": 0, + "fingerprint": 3267356128, + "type": 3, "invalidFingerprint": false }, { "foldername": "se", - "fingerprint": 1050004352, - "type": 0, + "fingerprint": 3741227923, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 2681478273, - "type": 0, + "fingerprint": 180033385, + "type": 3, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 2851979133, - "type": 0, + "fingerprint": 228056607, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 4064848781, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "tetra.mixins.json", "fingerprint": 2565242496, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "tetra.refmap.json", "fingerprint": 1482182319, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 54417051, + "packageFingerprint": 2637990296, "gameVersion": [ "1.16.3", "1.16.5", "Forge", "1.16.4" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000003", + "gameVersion": "1.16.3", + "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z", + "gameVersionName": "1.16.3", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000004", + "gameVersion": "1.16.4", + "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", + "gameVersionName": "1.16.4", + "gameVersionTypeId": 70886 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2559778, + "projectId": 289712, + "packageFingerprintId": 771567483, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3418226, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "tetra-1.16.5-3.17.0.jar" + "FileNameOnDisk": "tetra-1.16.5-3.18.0.jar" }, "dateInstalled": "2021-07-05T20:21:03.3441195Z", - "dateUpdated": "2021-09-22T17:51:12.9333836Z", - "dateLastUpdateAttempted": "2021-09-22T17:51:12.9333836Z", + "dateUpdated": "2021-10-28T17:17:56.5005756Z", + "dateLastUpdateAttempted": "2021-10-28T17:17:56.5005756Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -17530,14 +17853,14 @@ "addonID": 388172, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3495875, - "displayName": "geckolib-forge-1.16.5-3.0.48.jar", - "fileName": "geckolib-forge-1.16.5-3.0.48.jar", - "fileDate": "2021-10-19T02:19:56.003Z", - "fileLength": 3378308, + "id": 3502622, + "displayName": "geckolib-forge-1.16.5-3.0.49.jar", + "fileName": "geckolib-forge-1.16.5-3.0.49.jar", + "fileDate": "2021-10-24T20:05:14.72Z", + "fileLength": 3378331, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3495/875/geckolib-forge-1.16.5-3.0.48.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3502/622/geckolib-forge-1.16.5-3.0.49.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -17545,13 +17868,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 619113089, + "fingerprint": 3501023110, "type": 3, "invalidFingerprint": false }, { "foldername": "software", - "fingerprint": 1491112003, + "fingerprint": 345559989, "type": 3, "invalidFingerprint": false }, @@ -17580,7 +17903,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 3800138421, + "packageFingerprint": 2708726135, "gameVersion": [ "1.16.5", "Forge" @@ -17606,20 +17929,20 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2546448, + "renderCacheId": 2554899, "projectId": 388172, - "packageFingerprintId": 765486861, + "packageFingerprintId": 769518512, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 3394679, + "gameVersionMappingId": 3409817, "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "geckolib-forge-1.16.5-3.0.48.jar" + "FileNameOnDisk": "geckolib-forge-1.16.5-3.0.49.jar" }, "dateInstalled": "2021-07-05T20:21:03.3581211Z", - "dateUpdated": "2021-10-20T17:46:28.1557188Z", - "dateLastUpdateAttempted": "2021-10-20T17:46:28.1557188Z", - "status": 4, + "dateUpdated": "2021-10-25T18:00:24.6009353Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:24.6009353Z", + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -19172,7 +19495,7 @@ "dateInstalled": "2021-07-05T20:21:03.3511181Z", "dateUpdated": "2021-10-20T17:45:57.5291708Z", "dateLastUpdateAttempted": "2021-10-20T17:45:57.5291708Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -19400,83 +19723,102 @@ "addonID": 307788, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3425634, - "displayName": "rsrequestify-1.16.5-2.1.3.jar", - "fileName": "rsrequestify-1.16.5-2.1.3.jar", - "fileDate": "2021-08-14T23:35:26.71Z", - "fileLength": 61784, - "releaseType": 2, + "id": 3501351, + "displayName": "rsrequestify-1.16.5-2.1.4.jar", + "fileName": "rsrequestify-1.16.5-2.1.4.jar", + "fileDate": "2021-10-23T17:46:06.583Z", + "fileLength": 62128, + "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3425/634/rsrequestify-1.16.5-2.1.3.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3501/351/rsrequestify-1.16.5-2.1.4.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 0, + "id": 76537780, "addonId": 243076, "type": 3, - "fileId": 0 + "fileId": 3501351 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 2909008428, - "type": 0, + "fingerprint": 1201549991, + "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 417099370, - "type": 0, + "fingerprint": 1386641972, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", "fingerprint": 943343185, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 3052571584, - "type": 0, + "fingerprint": 829189082, + "type": 3, "invalidFingerprint": false }, { "foldername": "mcmod.info", "fingerprint": 2072392136, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 2707499699, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 1460254527, + "packageFingerprint": 1153904508, "gameVersion": [ - "1.16.3", "1.16.5", - "1.16.4" + "Forge" + ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, - "gameVersionDateReleased": "2020-09-10T14:44:20.443Z", - "gameId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2553215, + "projectId": 307788, + "packageFingerprintId": 768664442, + "gameVersionDateReleased": "2019-08-01T00:00:00Z", + "gameVersionMappingId": 3406735, + "gameVersionId": 7498, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "rsrequestify-1.16.5-2.1.3.jar" + "FileNameOnDisk": "rsrequestify-1.16.5-2.1.4.jar" }, "dateInstalled": "2021-07-05T20:21:03.3331219Z", - "dateUpdated": "2021-08-15T17:21:42.4826887Z", - "dateLastUpdateAttempted": "2021-08-15T17:21:42.4826887Z", + "dateUpdated": "2021-10-25T18:01:08.7073629Z", + "dateLastUpdateAttempted": "2021-10-25T18:01:08.7073629Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -20259,14 +20601,14 @@ "addonID": 399558, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3285196, - "displayName": "constructionwand-1.16.5-2.2.jar", - "fileName": "constructionwand-1.16.5-2.2.jar", - "fileDate": "2021-04-22T06:23:58.49Z", - "fileLength": 193910, + "id": 3499311, + "displayName": "constructionwand-1.16.5-2.4.jar", + "fileName": "constructionwand-1.16.5-2.4.jar", + "fileDate": "2021-10-22T17:10:18.007Z", + "fileLength": 195224, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3285/196/constructionwand-1.16.5-2.2.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3499/311/constructionwand-1.16.5-2.4.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -20274,13 +20616,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 4036072437, + "fingerprint": 3906816712, "type": 3, "invalidFingerprint": false }, { "foldername": "thetadev", - "fingerprint": 3081620486, + "fingerprint": 1788080518, "type": 3, "invalidFingerprint": false }, @@ -20290,12 +20632,6 @@ "type": 3, "invalidFingerprint": false }, - { - "foldername": "data", - "fingerprint": 1373703541, - "type": 3, - "invalidFingerprint": false - }, { "foldername": "logo.png", "fingerprint": 1765697479, @@ -20307,9 +20643,21 @@ "fingerprint": 4148778574, "type": 3, "invalidFingerprint": false + }, + { + "foldername": ".cache", + "fingerprint": 1361047111, + "type": 3, + "invalidFingerprint": false + }, + { + "foldername": "data", + "fingerprint": 1373703541, + "type": 3, + "invalidFingerprint": false } ], - "packageFingerprint": 476710429, + "packageFingerprint": 3223950522, "gameVersion": [ "1.16.3", "1.16.5", @@ -20323,35 +20671,35 @@ "gameVersion": "1.16.3", "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z", "gameVersionName": "1.16.3", - "gameVersionTypeId": 0 + "gameVersionTypeId": 70886 }, { "gameVersionPadded": "0000000001.0000000016.0000000005", "gameVersion": "1.16.5", "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", "gameVersionName": "1.16.5", - "gameVersionTypeId": 0 + "gameVersionTypeId": 70886 }, { "gameVersionPadded": "0", "gameVersion": "", "gameVersionReleaseDate": "2019-08-01T00:00:00Z", "gameVersionName": "Forge", - "gameVersionTypeId": 0 + "gameVersionTypeId": 68441 }, { "gameVersionPadded": "0000000001.0000000016.0000000004", "gameVersion": "1.16.4", "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", "gameVersionName": "1.16.4", - "gameVersionTypeId": 0 + "gameVersionTypeId": 70886 }, { "gameVersionPadded": "0000000001.0000000016.0000000002", "gameVersion": "1.16.2", "gameVersionReleaseDate": "2020-08-11T16:42:21.863Z", "gameVersionName": "1.16.2", - "gameVersionTypeId": 0 + "gameVersionTypeId": 70886 } ], "hasInstallScript": false, @@ -20359,19 +20707,19 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2277204, + "renderCacheId": 2550863, "projectId": 399558, - "packageFingerprintId": 648233959, + "packageFingerprintId": 768029309, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 2882846, + "gameVersionMappingId": 3404120, "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "constructionwand-1.16.5-2.2.jar" + "FileNameOnDisk": "constructionwand-1.16.5-2.4.jar" }, "dateInstalled": "2021-07-05T20:21:08.4404715Z", - "dateUpdated": "2021-07-05T20:21:08.4404715Z", - "dateLastUpdateAttempted": "0001-01-01T00:00:00", + "dateUpdated": "2021-10-25T18:00:58.3219376Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:58.3219376Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -20593,14 +20941,14 @@ "addonID": 419699, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3462013, - "displayName": "[Forge 1.16.4/5] v1.23.33", - "fileName": "architectury-1.23.33-forge.jar", - "fileDate": "2021-09-17T14:44:40.27Z", - "fileLength": 513560, + "id": 3500014, + "displayName": "[Forge 1.16.4/5] v1.24.35", + "fileName": "architectury-1.24.35-forge.jar", + "fileDate": "2021-10-23T11:20:22.647Z", + "fileLength": 531886, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3462/13/architectury-1.23.33-forge.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3500/14/architectury-1.24.35-forge.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -20609,84 +20957,111 @@ { "foldername": "architectury-common.mixins.json", "fingerprint": 1305967297, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "architectury.accessWidener", "fingerprint": 257494810, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "architectury-common-refmap.json", "fingerprint": 1953518274, - "type": 0, - "invalidFingerprint": false - }, - { - "foldername": "icon.png", - "fingerprint": 337711864, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 1096803035, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "architectury.mixins.json", "fingerprint": 1554387086, - "type": 0, + "type": 3, + "invalidFingerprint": false + }, + { + "foldername": "icon.png", + "fingerprint": 337711864, + "type": 3, "invalidFingerprint": false }, { "foldername": "META-INF", - "fingerprint": 1184458518, - "type": 0, + "fingerprint": 1635991817, + "type": 3, "invalidFingerprint": false }, { "foldername": "me", - "fingerprint": 187094204, - "type": 0, + "fingerprint": 2903555025, + "type": 3, "invalidFingerprint": false }, { - "foldername": "architectury_inject_architectury_common_53d158909e4141f29a002e4e846289d1_65633a536525e78795f5d2e868e91d166738c055fb3ad8e01516b6119e872ad6architectury12333devjar", - "fingerprint": 2315980521, - "type": 0, + "foldername": "architectury_inject_architectury_common_e7f3abf769e145fb9f87599a6d3a4577_902afc0b7fd7cd97f0d4e93ad10210350b8a984132bf635cc7600391892171e1architectury12435devjar", + "fingerprint": 2199580345, + "type": 3, "invalidFingerprint": false }, { "foldername": "architectury-forge-refmap.json", "fingerprint": 3556241074, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 1955599694, + "packageFingerprint": 1050498642, "gameVersion": [ "1.16.5", "Forge", "1.16.4" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000004", + "gameVersion": "1.16.4", + "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", + "gameVersionName": "1.16.4", + "gameVersionTypeId": 70886 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2551780, + "projectId": 419699, + "packageFingerprintId": 768456242, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3405872, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "architectury-1.23.33-forge.jar" + "FileNameOnDisk": "architectury-1.24.35-forge.jar" }, "dateInstalled": "2021-07-05T20:19:25.2879367Z", - "dateUpdated": "2021-09-18T21:18:53.0353687Z", - "dateLastUpdateAttempted": "2021-09-18T21:18:53.0353687Z", + "dateUpdated": "2021-10-25T18:02:01.7698699Z", + "dateLastUpdateAttempted": "2021-10-25T18:02:01.7698699Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -21671,106 +22046,126 @@ "addonID": 236307, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3482429, - "displayName": "IntegratedDynamics-1.16.5-1.10.2.jar", - "fileName": "IntegratedDynamics-1.16.5-1.10.2.jar", - "fileDate": "2021-10-05T18:16:04.087Z", - "fileLength": 3162330, + "id": 3498290, + "displayName": "IntegratedDynamics-1.16.5-1.10.3.jar", + "fileName": "IntegratedDynamics-1.16.5-1.10.3.jar", + "fileDate": "2021-10-21T18:05:19.93Z", + "fileLength": 3163798, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3482/429/IntegratedDynamics-1.16.5-1.10.2.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3498/290/IntegratedDynamics-1.16.5-1.10.3.jar", "isAlternate": false, - "alternateFileId": 3482430, + "alternateFileId": 3498294, "dependencies": [ { - "id": 0, + "id": 76367016, "addonId": 247007, "type": 3, - "fileId": 0 + "fileId": 3498290 }, { - "id": 0, + "id": 76367017, "addonId": 232758, "type": 3, - "fileId": 0 + "fileId": 3498290 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 2686072377, - "type": 0, + "fingerprint": 2449958965, + "type": 3, "invalidFingerprint": false }, { "foldername": "org", - "fingerprint": 2182935820, - "type": 0, + "fingerprint": 3883081620, + "type": 3, "invalidFingerprint": false }, { - "foldername": "assets", - "fingerprint": 2360440062, - "type": 0, + "foldername": "logo.png", + "fingerprint": 711418639, + "type": 3, + "invalidFingerprint": false + }, + { + "foldername": "logo_small.png", + "fingerprint": 2118832145, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 898374091, - "type": 0, + "type": 3, "invalidFingerprint": false }, { - "foldername": "logo_small.png", - "fingerprint": 2118832145, - "type": 0, + "foldername": "assets", + "fingerprint": 2534161911, + "type": 3, "invalidFingerprint": false }, { "foldername": "data", "fingerprint": 3939935539, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "LICENSE-re2j.txt", "fingerprint": 66756537, - "type": 0, - "invalidFingerprint": false - }, - { - "foldername": "logo.png", - "fingerprint": 711418639, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "vendors", "fingerprint": 1036984855, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 669592767, + "packageFingerprint": 1705749122, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2549594, + "projectId": 236307, + "packageFingerprintId": 767332552, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3401155, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "IntegratedDynamics-1.16.5-1.10.2.jar" + "FileNameOnDisk": "IntegratedDynamics-1.16.5-1.10.3.jar" }, "dateInstalled": "2021-07-05T20:19:25.3009353Z", - "dateUpdated": "2021-10-06T16:58:23.1824413Z", - "dateLastUpdateAttempted": "2021-10-06T16:58:23.1824413Z", + "dateUpdated": "2021-10-25T18:00:30.9581467Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:30.9581467Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -21898,14 +22293,14 @@ "addonID": 368293, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3496193, - "displayName": "Repurposed Structures v3.3.1 (1.16.5 MC)", - "fileName": "repurposed_structures_forge-3.3.1+1.16.5.jar", - "fileDate": "2021-10-19T14:11:06.913Z", - "fileLength": 5405977, + "id": 3499509, + "displayName": "Repurposed Structures v3.3.4 (1.16.5 MC)", + "fileName": "repurposed_structures_forge-3.3.4+1.16.5.jar", + "fileDate": "2021-10-22T20:43:44.883Z", + "fileLength": 5407396, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3496/193/repurposed_structures_forge-3.3.1+1.16.5.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3499/509/repurposed_structures_forge-3.3.4+1.16.5.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -21913,13 +22308,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 767866821, + "fingerprint": 2429862093, "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 2052469599, + "fingerprint": 239272627, "type": 3, "invalidFingerprint": false }, @@ -21931,7 +22326,7 @@ }, { "foldername": "data", - "fingerprint": 1449098701, + "fingerprint": 3052396804, "type": 3, "invalidFingerprint": false }, @@ -21960,7 +22355,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 1789096268, + "packageFingerprint": 1774745774, "gameVersion": [ "1.16.5", "Forge" @@ -21986,20 +22381,20 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2546859, + "renderCacheId": 2551109, "projectId": 368293, - "packageFingerprintId": 765744726, + "packageFingerprintId": 768151110, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 3395524, + "gameVersionMappingId": 3404595, "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "repurposed_structures_forge-3.3.1+1.16.5.jar" + "FileNameOnDisk": "repurposed_structures_forge-3.3.4+1.16.5.jar" }, "dateInstalled": "2021-08-05T21:06:59.9349112Z", - "dateUpdated": "2021-10-20T17:46:15.307112Z", - "dateLastUpdateAttempted": "2021-10-20T17:46:15.307112Z", - "status": 4, + "dateUpdated": "2021-10-25T18:01:58.3845638Z", + "dateLastUpdateAttempted": "2021-10-25T18:01:58.3845638Z", + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -22360,28 +22755,28 @@ "addonID": 410811, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3494209, - "displayName": "ftb-essentials-1605.1.4-build.28.jar", - "fileName": "ftb-essentials-1605.1.4-build.28.jar", - "fileDate": "2021-10-17T16:19:45.433Z", - "fileLength": 76788, + "id": 3510643, + "displayName": "ftb-essentials-1605.1.5-build.32.jar", + "fileName": "ftb-essentials-1605.1.5-build.32.jar", + "fileDate": "2021-10-31T16:35:20.04Z", + "fileLength": 77378, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3494/209/ftb-essentials-1605.1.4-build.28.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3510/643/ftb-essentials-1605.1.5-build.32.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 76047968, + "id": 77208986, "addonId": 404465, "type": 3, - "fileId": 3494209 + "fileId": 3510643 }, { - "id": 76047969, + "id": 77208987, "addonId": 314905, "type": 2, - "fileId": 3494209 + "fileId": 3510643 } ], "isAvailable": true, @@ -22412,18 +22807,18 @@ }, { "foldername": "META-INF", - "fingerprint": 3465117976, + "fingerprint": 2338248854, "type": 3, "invalidFingerprint": false }, { "foldername": "dev", - "fingerprint": 845244551, + "fingerprint": 3372936023, "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 3410244875, + "packageFingerprint": 2287512223, "gameVersion": [ "1.16.5" ], @@ -22441,19 +22836,19 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2544277, + "renderCacheId": 2565038, "projectId": 410811, - "packageFingerprintId": 764516470, + "packageFingerprintId": 774372097, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 3390613, + "gameVersionMappingId": 3428900, "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "ftb-essentials-1605.1.4-build.28.jar" + "FileNameOnDisk": "ftb-essentials-1605.1.5-build.32.jar" }, "dateInstalled": "2021-07-05T20:21:08.4264731Z", - "dateUpdated": "2021-10-20T17:46:28.4587164Z", - "dateLastUpdateAttempted": "2021-10-20T17:46:28.4587164Z", + "dateUpdated": "2021-11-01T18:10:52.2145079Z", + "dateLastUpdateAttempted": "2021-11-01T18:10:52.2145079Z", "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -22586,14 +22981,14 @@ "addonID": 399630, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3457017, - "displayName": "EmendatusEnigmatica-1.16.5-1.2.10", - "fileName": "EmendatusEnigmatica-1.16.5-1.2.10.jar", - "fileDate": "2021-09-11T23:48:15.223Z", - "fileLength": 3977740, + "id": 3510459, + "displayName": "EmendatusEnigmatica-1.16.5-1.2.12", + "fileName": "EmendatusEnigmatica-1.16.5-1.2.12.jar", + "fileDate": "2021-10-31T13:39:51.417Z", + "fileLength": 4401831, "releaseType": 3, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3457/17/EmendatusEnigmatica-1.16.5-1.2.10.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3510/459/EmendatusEnigmatica-1.16.5-1.2.12.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -22601,75 +22996,109 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 3780514876, - "type": 0, + "fingerprint": 1878779160, + "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 2749551635, - "type": 0, + "fingerprint": 3679245275, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 1589911189, - "type": 0, + "fingerprint": 3953869642, + "type": 3, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 3975310760, - "type": 0, + "fingerprint": 737700132, + "type": 3, "invalidFingerprint": false }, { "foldername": "emendatusenigmatica.mixins.json", "fingerprint": 332023941, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "logo.png", "fingerprint": 1118063826, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 2276242867, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "emendatusenigmatica.refmap.json", "fingerprint": 1265371035, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 2712966922, + "packageFingerprint": 4015928080, "gameVersion": [ "1.16.3", "1.16.5", "Forge", "1.16.4" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000003", + "gameVersion": "1.16.3", + "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z", + "gameVersionName": "1.16.3", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000004", + "gameVersion": "1.16.4", + "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", + "gameVersionName": "1.16.4", + "gameVersionTypeId": 70886 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2564805, + "projectId": 399630, + "packageFingerprintId": 774277231, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3428408, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "EmendatusEnigmatica-1.16.5-1.2.10.jar" + "FileNameOnDisk": "EmendatusEnigmatica-1.16.5-1.2.12.jar" }, "dateInstalled": "2021-09-13T17:30:41.8608324Z", - "dateUpdated": "2021-09-13T17:30:41.8728329Z", - "dateLastUpdateAttempted": "2021-09-13T17:30:41.8728329Z", - "status": 5, + "dateUpdated": "2021-11-01T18:10:56.0911834Z", + "dateLastUpdateAttempted": "2021-11-01T18:10:56.0911834Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -23550,7 +23979,7 @@ "dateInstalled": "2021-09-17T18:18:50.6213974Z", "dateUpdated": "2021-10-20T17:46:29.7614814Z", "dateLastUpdateAttempted": "2021-10-20T17:46:29.7614814Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -23818,106 +24247,126 @@ "addonID": 328085, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3419412, - "displayName": " Create 1.16.5 v0.3.2d", - "fileName": "create-mc1.16.5_v0.3.2d.jar", - "fileDate": "2021-08-08T18:50:11.737Z", - "fileLength": 11337001, + "id": 3499718, + "displayName": "Create 1.16.5 v0.3.2f", + "fileName": "create-mc1.16.5_v0.3.2f.jar", + "fileDate": "2021-10-23T01:57:53.057Z", + "fileLength": 11495277, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3419/412/create-mc1.16.5_v0.3.2d.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3499/718/create-mc1.16.5_v0.3.2f.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 0, - "addonId": 486392, - "type": 3, - "fileId": 0 - }, - { - "id": 0, + "id": 76483683, "addonId": 238222, "type": 2, - "fileId": 0 + "fileId": 3499718 + }, + { + "id": 76483682, + "addonId": 486392, + "type": 3, + "fileId": 3499718 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 188467572, - "type": 0, + "fingerprint": 2525191301, + "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 680092021, - "type": 0, + "fingerprint": 413189307, + "type": 3, "invalidFingerprint": false }, { "foldername": ".cache", - "fingerprint": 2786113706, - "type": 0, + "fingerprint": 1204948565, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 907648433, - "type": 0, + "fingerprint": 3915099975, + "type": 3, "invalidFingerprint": false }, { "foldername": "create.mixins.json", - "fingerprint": 3505967421, - "type": 0, + "fingerprint": 941123429, + "type": 3, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 3604133244, - "type": 0, + "fingerprint": 2155804724, + "type": 3, "invalidFingerprint": false }, { "foldername": "logo.png", "fingerprint": 2004783834, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 1782673937, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "create.refmap.json", - "fingerprint": 1151107717, - "type": 0, + "fingerprint": 1798590828, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 262284899, + "packageFingerprint": 2050102413, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2551391, + "projectId": 328085, + "packageFingerprintId": 768256186, "gameVersionDateReleased": "2019-08-01T00:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3405136, + "gameVersionId": 7498, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "create-mc1.16.5_v0.3.2d.jar" + "FileNameOnDisk": "create-mc1.16.5_v0.3.2f.jar" }, "dateInstalled": "2021-07-12T18:56:07.2846942Z", - "dateUpdated": "2021-08-11T14:43:31.2909174Z", - "dateLastUpdateAttempted": "2021-08-11T14:43:31.2909174Z", + "dateUpdated": "2021-10-25T18:00:09.8009598Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:09.8009598Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -25324,14 +25773,14 @@ "addonID": 231951, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3483884, - "displayName": "ImmersiveEngineering-1.16.5-5.0.4-139", - "fileName": "ImmersiveEngineering-1.16.5-5.0.4-139.jar", - "fileDate": "2021-10-07T11:19:12.973Z", - "fileLength": 10722921, + "id": 3497359, + "displayName": "ImmersiveEngineering-1.16.5-5.0.5-140", + "fileName": "ImmersiveEngineering-1.16.5-5.0.5-140.jar", + "fileDate": "2021-10-20T19:44:38.24Z", + "fileLength": 10131626, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3483/884/ImmersiveEngineering-1.16.5-5.0.4-139.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3497/359/ImmersiveEngineering-1.16.5-5.0.5-140.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -25339,13 +25788,7 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 2107520994, - "type": 3, - "invalidFingerprint": false - }, - { - "foldername": "mappings", - "fingerprint": 439494986, + "fingerprint": 2918498985, "type": 3, "invalidFingerprint": false }, @@ -25369,19 +25812,19 @@ }, { "foldername": "data", - "fingerprint": 4174693823, + "fingerprint": 4192982709, "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 1089542876, + "fingerprint": 2236092823, "type": 3, "invalidFingerprint": false }, { "foldername": ".cache", - "fingerprint": 218790205, + "fingerprint": 3371881690, "type": 3, "invalidFingerprint": false }, @@ -25393,24 +25836,24 @@ }, { "foldername": "blusunrize", - "fingerprint": 2306302506, + "fingerprint": 3806323918, "type": 3, "invalidFingerprint": false }, { - "foldername": "malte0811", - "fingerprint": 6391778, + "foldername": "invtweaks", + "fingerprint": 1311683996, "type": 3, "invalidFingerprint": false }, { - "foldername": "invtweaks", - "fingerprint": 1311683996, + "foldername": "malte0811", + "fingerprint": 6391778, "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 597708875, + "packageFingerprint": 2811759999, "gameVersion": [ "1.16.5", "Forge" @@ -25421,14 +25864,14 @@ "gameVersion": "1.16.5", "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", "gameVersionName": "1.16.5", - "gameVersionTypeId": 0 + "gameVersionTypeId": 70886 }, { "gameVersionPadded": "0", "gameVersion": "", "gameVersionReleaseDate": "2019-08-01T00:00:00Z", "gameVersionName": "Forge", - "gameVersionTypeId": 0 + "gameVersionTypeId": 68441 } ], "hasInstallScript": false, @@ -25436,19 +25879,19 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2530821, + "renderCacheId": 2548408, "projectId": 231951, - "packageFingerprintId": 757943079, + "packageFingerprintId": 766692584, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 3363130, + "gameVersionMappingId": 3398664, "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "ImmersiveEngineering-1.16.5-5.0.4-139.jar" + "FileNameOnDisk": "ImmersiveEngineering-1.16.5-5.0.5-140.jar" }, "dateInstalled": "2021-10-08T18:14:50.7214402Z", - "dateUpdated": "2021-10-15T19:25:46.9142457Z", - "dateLastUpdateAttempted": "2021-10-15T19:25:46.9142457Z", + "dateUpdated": "2021-10-25T18:00:36.1754708Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:36.1754708Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -25543,14 +25986,14 @@ "addonID": 513857, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3447941, - "displayName": "oauth-1.06.1-1.16.jar", - "fileName": "oauth-1.06.1-1.16.jar", - "fileDate": "2021-09-03T10:15:10.273Z", - "fileLength": 51399, + "id": 3507476, + "displayName": "oauth-1.07-1.16.jar", + "fileName": "oauth-1.07-1.16.jar", + "fileDate": "2021-10-28T14:48:19.613Z", + "fileLength": 54976, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3447/941/oauth-1.06.1-1.16.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3507/476/oauth-1.07-1.16.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -25558,49 +26001,108 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 2368002889, - "type": 0, + "fingerprint": 340072665, + "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 2578193890, - "type": 0, + "fingerprint": 3098240706, + "type": 3, "invalidFingerprint": false }, { "foldername": "oauth.png", "fingerprint": 1778038094, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 2021780760, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 2915755594, + "packageFingerprint": 2373345024, "gameVersion": [ + "1.16.3", + "1.16.1", "1.16", "1.16.5", - "Forge" + "Forge", + "1.16.4", + "1.16.2" + ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000003", + "gameVersion": "1.16.3", + "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z", + "gameVersionName": "1.16.3", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000001", + "gameVersion": "1.16.1", + "gameVersionReleaseDate": "2020-06-24T12:41:11.823Z", + "gameVersionName": "1.16.1", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016", + "gameVersion": "1.16", + "gameVersionReleaseDate": "2020-06-23T13:41:08.75Z", + "gameVersionName": "1.16", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000004", + "gameVersion": "1.16.4", + "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", + "gameVersionName": "1.16.4", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000002", + "gameVersion": "1.16.2", + "gameVersionReleaseDate": "2020-08-11T16:42:21.863Z", + "gameVersionName": "1.16.2", + "gameVersionTypeId": 70886 + } ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2560884, + "projectId": 513857, + "packageFingerprintId": 772277476, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3420237, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "oauth-1.06.1-1.16.jar" + "FileNameOnDisk": "oauth-1.07-1.16.jar" }, "dateInstalled": "2021-09-22T19:31:09.1959499Z", - "dateUpdated": "2021-09-22T19:31:09.2199512Z", - "dateLastUpdateAttempted": "2021-09-22T19:31:09.2199512Z", + "dateUpdated": "2021-10-30T18:14:28.7765215Z", + "dateLastUpdateAttempted": "2021-10-30T18:14:28.7765215Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -26277,14 +26779,14 @@ "addonID": 496030, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3474994, - "displayName": "EnigmaticGraves-1.6.3.jar", - "fileName": "EnigmaticGraves-1.6.3.jar", - "fileDate": "2021-09-27T18:57:40.617Z", - "fileLength": 72445, - "releaseType": 1, + "id": 3507614, + "displayName": "EnigmaticGraves-1.6.5.jar", + "fileName": "EnigmaticGraves-1.6.5.jar", + "fileDate": "2021-10-28T17:35:11.233Z", + "fileLength": 78317, + "releaseType": 2, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3474/994/EnigmaticGraves-1.6.3.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3507/614/EnigmaticGraves-1.6.5.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -26292,59 +26794,80 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 2327841231, - "type": 0, + "fingerprint": 1343251591, + "type": 3, "invalidFingerprint": false }, { "foldername": "dev", - "fingerprint": 2325831502, - "type": 0, + "fingerprint": 1370232033, + "type": 3, "invalidFingerprint": false }, { "foldername": ".cache", - "fingerprint": 3920192458, - "type": 0, + "fingerprint": 3398154213, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 1514560904, - "type": 0, + "fingerprint": 3529979887, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 1438559181, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "enigmaticgraves.refmap.json", "fingerprint": 1493072104, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 4035277360, + "packageFingerprint": 1172161471, "gameVersion": [ - "1.16.5" + "1.16.5", + "Forge" + ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, - "gameVersionDateReleased": "2021-01-15T14:14:48.91Z", - "gameId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2561060, + "projectId": 496030, + "packageFingerprintId": 772366989, + "gameVersionDateReleased": "2019-08-01T00:00:00Z", + "gameVersionMappingId": 3420636, + "gameVersionId": 7498, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "EnigmaticGraves-1.6.3.jar" + "FileNameOnDisk": "EnigmaticGraves-1.6.5.jar" }, - "dateInstalled": "2021-07-13T20:16:02.8369272Z", - "dateUpdated": "2021-10-07T18:09:14.9035276Z", - "dateLastUpdateAttempted": "2021-10-07T18:09:14.9035276Z", + "dateInstalled": "2021-10-28T17:27:32.914677Z", + "dateUpdated": "2021-10-30T18:14:30.6824015Z", + "dateLastUpdateAttempted": "2021-10-30T18:14:30.6824015Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -26360,14 +26883,14 @@ "addonID": 272335, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3349690, - "displayName": "Cucumber-1.16.4-4.1.10.jar", - "fileName": "Cucumber-1.16.4-4.1.10.jar", - "fileDate": "2021-06-12T22:58:45.34Z", - "fileLength": 158783, + "id": 3507886, + "displayName": "Cucumber-1.16.5-4.1.12.jar", + "fileName": "Cucumber-1.16.5-4.1.12.jar", + "fileDate": "2021-10-29T00:47:14.6Z", + "fileLength": 158447, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3349/690/Cucumber-1.16.4-4.1.10.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3507/886/Cucumber-1.16.5-4.1.12.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -26375,19 +26898,19 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 3268531547, + "fingerprint": 905409379, "type": 3, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 3024470326, + "fingerprint": 3055036028, "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 1785728476, + "fingerprint": 1451239742, "type": 3, "invalidFingerprint": false }, @@ -26398,11 +26921,10 @@ "invalidFingerprint": false } ], - "packageFingerprint": 3280041175, + "packageFingerprint": 2682762223, "gameVersion": [ "1.16.5", - "Forge", - "1.16.4" + "Forge" ], "sortableGameVersion": [ { @@ -26410,21 +26932,14 @@ "gameVersion": "1.16.5", "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", "gameVersionName": "1.16.5", - "gameVersionTypeId": 0 + "gameVersionTypeId": 70886 }, { "gameVersionPadded": "0", "gameVersion": "", "gameVersionReleaseDate": "2019-08-01T00:00:00Z", "gameVersionName": "Forge", - "gameVersionTypeId": 0 - }, - { - "gameVersionPadded": "0000000001.0000000016.0000000004", - "gameVersion": "1.16.4", - "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", - "gameVersionName": "1.16.4", - "gameVersionTypeId": 0 + "gameVersionTypeId": 68441 } ], "hasInstallScript": false, @@ -26432,19 +26947,19 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2359608, + "renderCacheId": 2561408, "projectId": 272335, - "packageFingerprintId": 682567680, + "packageFingerprintId": 772563107, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 3037894, + "gameVersionMappingId": 3421460, "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "Cucumber-1.16.4-4.1.10.jar" + "FileNameOnDisk": "Cucumber-1.16.5-4.1.12.jar" }, "dateInstalled": "2021-07-05T20:21:15.1320328Z", - "dateUpdated": "2021-07-05T20:21:15.1320328Z", - "dateLastUpdateAttempted": "0001-01-01T00:00:00", + "dateUpdated": "2021-10-30T18:18:09.9380123Z", + "dateLastUpdateAttempted": "2021-10-30T18:18:09.9380123Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -26476,19 +26991,19 @@ { "foldername": "assets", "fingerprint": 874958223, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 2937881892, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.png", "fingerprint": 4104230281, - "type": 0, + "type": 3, "invalidFingerprint": false } ], @@ -26501,21 +27016,69 @@ "1.16.4", "1.16.2" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000003", + "gameVersion": "1.16.3", + "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z", + "gameVersionName": "1.16.3", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000001", + "gameVersion": "1.16.1", + "gameVersionReleaseDate": "2020-06-24T12:41:11.823Z", + "gameVersionName": "1.16.1", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016", + "gameVersion": "1.16", + "gameVersionReleaseDate": "2020-06-23T13:41:08.75Z", + "gameVersionName": "1.16", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000004", + "gameVersion": "1.16.4", + "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", + "gameVersionName": "1.16.4", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000002", + "gameVersion": "1.16.2", + "gameVersionReleaseDate": "2020-08-11T16:42:21.863Z", + "gameVersionName": "1.16.2", + "gameVersionTypeId": 70886 + } + ], "hasInstallScript": false, - "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "isCompatibleWithClient": true, + "categorySectionPackageType": 3, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2231285, + "projectId": 390898, + "packageFingerprintId": 630678459, "gameVersionDateReleased": "2020-06-23T13:41:08.75Z", - "gameId": 0, + "gameVersionMappingId": 2813044, + "gameVersionId": 7890, + "gameId": 432, "isServerPack": false, "FileNameOnDisk": "ERP-V1.8.zip" }, - "dateInstalled": "2021-07-15T04:42:23.8973319Z", - "dateUpdated": "2021-07-15T04:42:23.9253291Z", - "dateLastUpdateAttempted": "2021-07-15T04:42:23.9253291Z", - "status": 5, + "dateInstalled": "2021-11-01T05:00:03.7780705Z", + "dateUpdated": "2021-11-01T05:00:03.7780705Z", + "dateLastUpdateAttempted": "0001-01-01T00:00:00", + "status": 3, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -26837,14 +27400,14 @@ "addonID": 511733, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3481565, - "displayName": "clickadv-1.9.jar", - "fileName": "clickadv-1.9.jar", - "fileDate": "2021-10-04T20:41:04.657Z", + "id": 3504082, + "displayName": "clickadv-2.0.jar", + "fileName": "clickadv-2.0.jar", + "fileDate": "2021-10-25T08:21:13.413Z", "fileLength": 15198, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3481/565/clickadv-1.9.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3504/82/clickadv-2.0.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -26852,56 +27415,90 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 1008933787, - "type": 0, + "fingerprint": 2444410503, + "type": 3, "invalidFingerprint": false }, { "foldername": "com", "fingerprint": 1472023426, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "clickadv.mixins.json", "fingerprint": 69916680, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 1438559181, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "clickadv.refmap.json", "fingerprint": 2626024748, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 1677456705, + "packageFingerprint": 3963888341, "gameVersion": [ "1.14.4", "1.16.5", "Forge", "1.15.2" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000014.0000000004", + "gameVersion": "1.14.4", + "gameVersionReleaseDate": "2019-07-19T00:00:00Z", + "gameVersionName": "1.14.4", + "gameVersionTypeId": 64806 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + }, + { + "gameVersionPadded": "0000000001.0000000015.0000000002", + "gameVersion": "1.15.2", + "gameVersionReleaseDate": "2020-01-22T00:00:00Z", + "gameVersionName": "1.15.2", + "gameVersionTypeId": 68722 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2556513, + "projectId": 511733, + "packageFingerprintId": 769801810, "gameVersionDateReleased": "2019-07-19T00:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3411888, + "gameVersionId": 7469, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "clickadv-1.9.jar" + "FileNameOnDisk": "clickadv-2.0.jar" }, "dateInstalled": "2021-08-13T18:01:17.0810367Z", - "dateUpdated": "2021-10-06T16:58:23.1824413Z", - "dateLastUpdateAttempted": "2021-10-06T16:58:23.1824413Z", + "dateUpdated": "2021-10-25T18:00:59.8919355Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:59.8919355Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -27093,7 +27690,7 @@ "dateInstalled": "2021-07-05T20:21:15.1220335Z", "dateUpdated": "2021-07-05T20:21:15.1220335Z", "dateLastUpdateAttempted": "0001-01-01T00:00:00", - "status": 3, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -27487,40 +28084,40 @@ "addonID": 314906, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3495215, - "displayName": "ftb-chunks-forge-1605.3.2-build.69.jar", - "fileName": "ftb-chunks-forge-1605.3.2-build.69.jar", - "fileDate": "2021-10-18T13:47:54.753Z", - "fileLength": 720046, + "id": 3509329, + "displayName": "ftb-chunks-forge-1605.3.2-build.79.jar", + "fileName": "ftb-chunks-forge-1605.3.2-build.79.jar", + "fileDate": "2021-10-30T12:53:27.86Z", + "fileLength": 716542, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3495/215/ftb-chunks-forge-1605.3.2-build.69.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3509/329/ftb-chunks-forge-1605.3.2-build.79.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 76132855, - "addonId": 404468, + "id": 77114894, + "addonId": 419699, "type": 3, - "fileId": 3495215 + "fileId": 3509329 }, { - "id": 76132853, - "addonId": 404465, + "id": 77114895, + "addonId": 404468, "type": 3, - "fileId": 3495215 + "fileId": 3509329 }, { - "id": 76132854, - "addonId": 419699, + "id": 77114893, + "addonId": 404465, "type": 3, - "fileId": 3495215 + "fileId": 3509329 }, { - "id": 76132856, + "id": 77114896, "addonId": 314905, "type": 2, - "fileId": 3495215 + "fileId": 3509329 } ], "isAvailable": true, @@ -27569,24 +28166,24 @@ }, { "foldername": "META-INF", - "fingerprint": 2878223894, + "fingerprint": 3798257616, "type": 3, "invalidFingerprint": false }, { "foldername": "dev", - "fingerprint": 481391167, + "fingerprint": 3759549079, "type": 3, "invalidFingerprint": false }, { - "foldername": "architectury_inject_FTBChunks1165_common_852293788af048419da53ca6edb7cbfe", - "fingerprint": 882899311, + "foldername": "architectury_inject_FTBChunks1165_common_01e0f3f1e7eb44cab1228374b29f76ff", + "fingerprint": 584626760, "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 4022791098, + "packageFingerprint": 1669419842, "gameVersion": [ "1.16.5", "Forge" @@ -27612,20 +28209,20 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2545595, + "renderCacheId": 2563318, "projectId": 314906, - "packageFingerprintId": 765032255, + "packageFingerprintId": 773646880, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 3392908, + "gameVersionMappingId": 3425510, "gameVersionId": 4458, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "ftb-chunks-forge-1605.3.2-build.69.jar" + "FileNameOnDisk": "ftb-chunks-forge-1605.3.2-build.79.jar" }, "dateInstalled": "2021-09-10T17:14:11.272099Z", - "dateUpdated": "2021-10-20T17:46:29.6294838Z", - "dateLastUpdateAttempted": "2021-10-20T17:46:29.6294838Z", - "status": 4, + "dateUpdated": "2021-10-30T18:18:13.2024477Z", + "dateLastUpdateAttempted": "2021-10-30T18:18:13.2024477Z", + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -27640,112 +28237,125 @@ "addonID": 422301, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3485233, - "displayName": "sophisticatedbackpacks-1.16.5-3.4.2.354.jar", - "fileName": "sophisticatedbackpacks-1.16.5-3.4.2.354.jar", - "fileDate": "2021-10-08T22:36:52.187Z", - "fileLength": 1252692, + "id": 3510890, + "displayName": "sophisticatedbackpacks-1.16.5-3.8.1.384.jar", + "fileName": "sophisticatedbackpacks-1.16.5-3.8.1.384.jar", + "fileDate": "2021-10-31T20:00:12.24Z", + "fileLength": 1357551, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3485/233/sophisticatedbackpacks-1.16.5-3.4.2.354.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3510/890/sophisticatedbackpacks-1.16.5-3.8.1.384.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 0, - "addonId": 309927, + "id": 77231677, + "addonId": 243121, "type": 2, - "fileId": 0 + "fileId": 3510890 }, { - "id": 0, + "id": 77231674, "addonId": 225643, "type": 2, - "fileId": 0 + "fileId": 3510890 }, { - "id": 0, - "addonId": 233071, + "id": 77231678, + "addonId": 301356, "type": 2, - "fileId": 0 + "fileId": 3510890 }, { - "id": 0, - "addonId": 238222, + "id": 77231675, + "addonId": 233071, "type": 2, - "fileId": 0 + "fileId": 3510890 }, { - "id": 0, - "addonId": 301356, + "id": 77231676, + "addonId": 238222, "type": 2, - "fileId": 0 + "fileId": 3510890 }, { - "id": 0, - "addonId": 243121, + "id": 77231679, + "addonId": 309927, "type": 2, - "fileId": 0 + "fileId": 3510890 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 3910823808, - "type": 0, + "fingerprint": 2505929605, + "type": 3, "invalidFingerprint": false }, { "foldername": "net", - "fingerprint": 139536063, - "type": 0, + "fingerprint": 1815179169, + "type": 3, "invalidFingerprint": false }, { "foldername": "logo.png", "fingerprint": 2552684475, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 1102936719, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 2597053471, - "type": 0, + "fingerprint": 3025198443, + "type": 3, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 1415314844, - "type": 0, + "fingerprint": 2119485612, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 313775566, + "packageFingerprint": 3477256730, "gameVersion": [ "1.16.5" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2565363, + "projectId": 422301, + "packageFingerprintId": 774541598, "gameVersionDateReleased": "2021-01-15T14:14:48.91Z", - "gameId": 0, + "gameVersionMappingId": 3429601, + "gameVersionId": 8203, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "sophisticatedbackpacks-1.16.5-3.4.2.354.jar" + "FileNameOnDisk": "sophisticatedbackpacks-1.16.5-3.8.1.384.jar" }, "dateInstalled": "2021-07-05T20:21:15.1320328Z", - "dateUpdated": "2021-10-09T18:04:04.3029611Z", - "dateLastUpdateAttempted": "2021-10-09T18:04:04.3029611Z", - "status": 5, + "dateUpdated": "2021-11-01T18:10:52.0655368Z", + "dateLastUpdateAttempted": "2021-11-01T18:10:52.0655368Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -27989,88 +28599,108 @@ "addonID": 294815, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3431677, - "displayName": "aiotbotania-1.16.5-1.8.1.jar", - "fileName": "aiotbotania-1.16.5-1.8.1.jar", - "fileDate": "2021-08-19T19:11:22.037Z", - "fileLength": 220723, + "id": 3507609, + "displayName": "aiotbotania-1.16.5-1.8.4.jar", + "fileName": "aiotbotania-1.16.5-1.8.4.jar", + "fileDate": "2021-10-28T17:32:09.573Z", + "fileLength": 220776, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3431/677/aiotbotania-1.16.5-1.8.1.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3507/609/aiotbotania-1.16.5-1.8.4.jar", "isAlternate": false, - "alternateFileId": 3431678, + "alternateFileId": 3507610, "dependencies": [ { - "id": 0, + "id": 76974212, "addonId": 400058, "type": 2, - "fileId": 0 + "fileId": 3507609 }, { - "id": 0, + "id": 76974211, "addonId": 225643, "type": 3, - "fileId": 0 + "fileId": 3507609 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 1194287551, - "type": 0, + "fingerprint": 3626764288, + "type": 3, "invalidFingerprint": false }, { "foldername": "de", - "fingerprint": 724339096, - "type": 0, + "fingerprint": 1695800933, + "type": 3, "invalidFingerprint": false }, { - "foldername": "assets", - "fingerprint": 1955109219, - "type": 0, + "foldername": "data", + "fingerprint": 1692540400, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 222068915, - "type": 0, + "type": 3, "invalidFingerprint": false }, { - "foldername": "data", - "fingerprint": 1692540400, - "type": 0, + "foldername": "assets", + "fingerprint": 1955109219, + "type": 3, "invalidFingerprint": false }, { "foldername": "logo.png", "fingerprint": 2459156036, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 256948889, + "packageFingerprint": 680828473, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2561055, + "projectId": 294815, + "packageFingerprintId": 772366264, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3420623, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "aiotbotania-1.16.5-1.8.1.jar" + "FileNameOnDisk": "aiotbotania-1.16.5-1.8.4.jar" }, "dateInstalled": "2021-07-05T20:31:05.1764869Z", - "dateUpdated": "2021-08-22T11:00:36.7650096Z", - "dateLastUpdateAttempted": "2021-08-22T11:00:36.7650096Z", + "dateUpdated": "2021-10-30T18:14:34.202324Z", + "dateLastUpdateAttempted": "2021-10-30T18:14:34.202324Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -28980,28 +29610,28 @@ "addonID": 404465, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3476854, - "displayName": "ftb-library-forge-1605.3.3-build.74.jar", - "fileName": "ftb-library-forge-1605.3.3-build.74.jar", - "fileDate": "2021-09-30T01:34:26.51Z", - "fileLength": 566958, + "id": 3510634, + "displayName": "ftb-library-forge-1605.3.4-build.79.jar", + "fileName": "ftb-library-forge-1605.3.4-build.79.jar", + "fileDate": "2021-10-31T16:26:59.83Z", + "fileLength": 568909, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3476/854/ftb-library-forge-1605.3.3-build.74.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3510/634/ftb-library-forge-1605.3.4-build.79.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 0, - "addonId": 419699, - "type": 3, - "fileId": 0 - }, - { - "id": 0, + "id": 77208679, "addonId": 238222, "type": 2, - "fileId": 0 + "fileId": 3510634 + }, + { + "id": 77208678, + "addonId": 419699, + "type": 3, + "fileId": 3510634 } ], "isAvailable": true, @@ -29009,72 +29639,92 @@ { "foldername": "ftblibrary-common.mixins.json", "fingerprint": 2229262088, - "type": 0, + "type": 3, "invalidFingerprint": false }, { - "foldername": "kubejs.classfilter.txt", - "fingerprint": 1091646804, - "type": 0, + "foldername": "assets", + "fingerprint": 1835580189, + "type": 3, "invalidFingerprint": false }, { - "foldername": "assets", - "fingerprint": 3890636078, - "type": 0, + "foldername": "kubejs.classfilter.txt", + "fingerprint": 1091646804, + "type": 3, "invalidFingerprint": false }, { "foldername": "ftb-library-common-refmap.json", "fingerprint": 2537558737, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 239616976, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "META-INF", - "fingerprint": 2855012279, - "type": 0, + "fingerprint": 426675041, + "type": 3, "invalidFingerprint": false }, { "foldername": "dev", - "fingerprint": 763052178, - "type": 0, + "fingerprint": 1356525441, + "type": 3, "invalidFingerprint": false }, { - "foldername": "architectury_inject_FTBLibrary1165_common_3f58a24f26744500b868ea19b45ec4d6", - "fingerprint": 1367479450, - "type": 0, + "foldername": "architectury_inject_FTBLibrary1165_common_26f0f7a8da4544d68ada2e41388648dd", + "fingerprint": 939305847, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 15769651, + "packageFingerprint": 1281848676, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2565027, + "projectId": 404465, + "packageFingerprintId": 774370231, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3428878, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "ftb-library-forge-1605.3.3-build.74.jar" + "FileNameOnDisk": "ftb-library-forge-1605.3.4-build.79.jar" }, "dateInstalled": "2021-08-18T18:00:56.9919032Z", - "dateUpdated": "2021-10-02T18:13:53.065276Z", - "dateLastUpdateAttempted": "2021-10-02T18:13:53.065276Z", - "status": 5, + "dateUpdated": "2021-11-01T18:10:51.995871Z", + "dateLastUpdateAttempted": "2021-11-01T18:10:51.995871Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -29185,7 +29835,7 @@ "dateInstalled": "2021-07-05T20:21:15.1320328Z", "dateUpdated": "2021-10-20T17:46:28.3477145Z", "dateLastUpdateAttempted": "2021-10-20T17:46:28.3477145Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -29685,14 +30335,14 @@ "addonID": 357540, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3432418, - "displayName": "[Forge.1.16.2-1.16.5] InventoryHUD+ (v3.4.0)", - "fileName": "InventoryHud_[1.16.2-1.16.5].forge-3.4.0.jar", - "fileDate": "2021-08-20T14:17:37.54Z", - "fileLength": 196910, + "id": 3505181, + "displayName": "[Forge.1.16.2-1.16.5] InventoryHUD+ (v3.4.1)", + "fileName": "InventoryHud_[1.16.2-1.16.5].forge-3.4.1.jar", + "fileDate": "2021-10-26T08:32:02.063Z", + "fileLength": 197654, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3432/418/InventoryHud_[1.16.2-1.16.5].forge-3.4.0.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3505/181/InventoryHud_[1.16.2-1.16.5].forge-3.4.1.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -29700,36 +30350,36 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 4200453640, - "type": 0, + "fingerprint": 954236187, + "type": 3, "invalidFingerprint": false }, { "foldername": "dlovin", - "fingerprint": 637678159, - "type": 0, + "fingerprint": 3837508223, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 1366209809, - "type": 0, + "fingerprint": 1600314190, + "type": 3, "invalidFingerprint": false }, { "foldername": "logo.png", "fingerprint": 2496424231, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 1438559181, - "type": 0, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 1510091854, + "packageFingerprint": 3040432000, "gameVersion": [ "1.16.3", "1.16.5", @@ -29737,20 +30387,61 @@ "1.16.4", "1.16.2" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000003", + "gameVersion": "1.16.3", + "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z", + "gameVersionName": "1.16.3", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000004", + "gameVersion": "1.16.4", + "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", + "gameVersionName": "1.16.4", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000002", + "gameVersion": "1.16.2", + "gameVersionReleaseDate": "2020-08-11T16:42:21.863Z", + "gameVersionName": "1.16.2", + "gameVersionTypeId": 70886 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2557929, + "projectId": 357540, + "packageFingerprintId": 770618222, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3414614, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "InventoryHud_[1.16.2-1.16.5].forge-3.4.0.jar" + "FileNameOnDisk": "InventoryHud_[1.16.2-1.16.5].forge-3.4.1.jar" }, "dateInstalled": "2021-07-05T20:21:15.1520307Z", - "dateUpdated": "2021-08-22T11:00:53.2590986Z", - "dateLastUpdateAttempted": "2021-08-22T11:00:53.2590986Z", + "dateUpdated": "2021-10-27T17:18:43.3384684Z", + "dateLastUpdateAttempted": "2021-10-27T17:18:43.3384684Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -31839,7 +32530,7 @@ "dateInstalled": "2021-10-20T17:51:18.801426Z", "dateUpdated": "2021-10-20T17:51:18.8124197Z", "dateLastUpdateAttempted": "2021-10-20T17:51:18.8124197Z", - "status": 3, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -31848,7 +32539,7 @@ "isFuzzyMatch": false, "preferenceReleaseType": null, "manifestName": null, - "installedTargets": [] + "installedTargets": null }, { "addonID": 299540, @@ -32875,63 +33566,83 @@ "addonID": 250398, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3480210, - "displayName": "Controlling-7.0.0.26.jar", - "fileName": "Controlling-7.0.0.26.jar", - "fileDate": "2021-10-03T15:46:45.793Z", - "fileLength": 54388, + "id": 3501319, + "displayName": "Controlling-7.0.0.27.jar", + "fileName": "Controlling-7.0.0.27.jar", + "fileDate": "2021-10-23T17:14:45.203Z", + "fileLength": 54868, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3480/210/Controlling-7.0.0.26.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3501/319/Controlling-7.0.0.27.jar", "isAlternate": false, - "alternateFileId": 3480211, + "alternateFileId": 3501320, "dependencies": [], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 1619437895, - "type": 0, + "fingerprint": 3728449714, + "type": 3, "invalidFingerprint": false }, { "foldername": "com", "fingerprint": 2902717494, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 98047162, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 1317702248, - "type": 0, + "fingerprint": 3664116496, + "type": 3, "invalidFingerprint": false } ], - "packageFingerprint": 2840124715, + "packageFingerprint": 1142186317, "gameVersion": [ "1.16.5", "Forge" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5", + "gameVersionTypeId": 70886 + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge", + "gameVersionTypeId": 68441 + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2553172, + "projectId": 250398, + "packageFingerprintId": 768656302, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 3406672, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "Controlling-7.0.0.26.jar" + "FileNameOnDisk": "Controlling-7.0.0.27.jar" }, "dateInstalled": "2021-07-05T20:21:18.9860639Z", - "dateUpdated": "2021-10-04T17:58:41.6575877Z", - "dateLastUpdateAttempted": "2021-10-04T17:58:41.6575877Z", + "dateUpdated": "2021-10-25T18:00:57.6849346Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:57.6849346Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -33144,14 +33855,14 @@ "addonID": 532286, "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f", "installedFile": { - "id": 3496673, - "displayName": "jeed-1.16.5-1.2.jar", - "fileName": "jeed-1.16.5-1.2.jar", - "fileDate": "2021-10-20T00:14:10.843Z", - "fileLength": 69201, + "id": 3498507, + "displayName": "jeed-1.16.5-1.3.jar", + "fileName": "jeed-1.16.5-1.3.jar", + "fileDate": "2021-10-21T21:57:13.517Z", + "fileLength": 67686, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3496/673/jeed-1.16.5-1.2.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3498/507/jeed-1.16.5-1.3.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -33165,7 +33876,7 @@ }, { "foldername": "net", - "fingerprint": 2884587330, + "fingerprint": 405967944, "type": 3, "invalidFingerprint": false }, @@ -33206,7 +33917,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 2018940120, + "packageFingerprint": 3101735999, "gameVersion": [ "1.16.3", "1.16.5", @@ -33240,20 +33951,20 @@ "categorySectionPackageType": 6, "restrictProjectFileAccess": 1, "projectStatus": 4, - "renderCacheId": 2547496, + "renderCacheId": 2549864, "projectId": 532286, - "packageFingerprintId": 766001755, + "packageFingerprintId": 767511639, "gameVersionDateReleased": "2020-09-10T14:44:20.443Z", - "gameVersionMappingId": 3396797, + "gameVersionMappingId": 3401731, "gameVersionId": 8056, "gameId": 432, "isServerPack": false, - "FileNameOnDisk": "jeed-1.16.5-1.2.jar" + "FileNameOnDisk": "jeed-1.16.5-1.3.jar" }, "dateInstalled": "2021-10-01T04:22:30.4801221Z", - "dateUpdated": "2021-10-20T17:46:28.3847135Z", - "dateLastUpdateAttempted": "2021-10-20T17:46:28.3847135Z", - "status": 4, + "dateUpdated": "2021-10-25T18:00:41.470726Z", + "dateLastUpdateAttempted": "2021-10-25T18:00:41.470726Z", + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false,