From d112562513aeae70f5ab8912fe6fcf4d4ad41111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Tue, 23 Feb 2021 22:13:54 +0100 Subject: [PATCH 01/35] set advanced tooltips off by default --- config/defaultoptions/options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/defaultoptions/options.txt b/config/defaultoptions/options.txt index e5e3b02b68..91b8194815 100644 --- a/config/defaultoptions/options.txt +++ b/config/defaultoptions/options.txt @@ -43,7 +43,7 @@ chatLineSpacing:0.0 textBackgroundOpacity:0.5 backgroundForChatOnly:true hideServerAddress:false -advancedItemTooltips:true +advancedItemTooltips:false pauseOnLostFocus:true overrideWidth:0 overrideHeight:0 From 3512b54ef72d206597de4bbaccba7bfac290ee65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Tue, 23 Feb 2021 22:32:36 +0100 Subject: [PATCH 02/35] Update suggestion.md --- .github/ISSUE_TEMPLATE/suggestion.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/suggestion.md b/.github/ISSUE_TEMPLATE/suggestion.md index eb389400eb..15410c5128 100644 --- a/.github/ISSUE_TEMPLATE/suggestion.md +++ b/.github/ISSUE_TEMPLATE/suggestion.md @@ -4,8 +4,6 @@ about: Suggest a change or addition to the modpack labels: Suggestion --- -**CurseForge Link** - **Description** Write a short description of your suggestion here. From b6c583d2a343d7d4b2911e1aad7c4e5af26d376e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Tue, 23 Feb 2021 23:00:01 +0100 Subject: [PATCH 03/35] editing signs now requires an empty hand --- config/quark-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/quark-common.toml b/config/quark-common.toml index 35eb9155b9..392ef073c5 100644 --- a/config/quark-common.toml +++ b/config/quark-common.toml @@ -352,7 +352,7 @@ "Lava Bucket As Trash" = true [tweaks.sign_editing] - "Requires Empty Hand" = false + "Requires Empty Hand" = true [tweaks.pat_the_dogs] #How many ticks it takes for a dog to want affection after being pet/tamed; leave -1 to disable From f4e9401e0f3493533c2cbfdd113cbf3b2dc5eadc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Wed, 24 Feb 2021 08:29:37 +0100 Subject: [PATCH 04/35] set artifacts campsites to not use modded chests, just in case --- config/artifacts-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/artifacts-common.toml b/config/artifacts-common.toml index dbc7fa659a..3ac15b2829 100644 --- a/config/artifacts-common.toml +++ b/config/artifacts-common.toml @@ -12,7 +12,7 @@ #Range: 0 ~ 255 campsite_max_y = 45 #Whether to use wooden chests from other mods when generating campsites, may make it easier to distinguish them from mimics - use_modded_chests = true + use_modded_chests = false #Probability for a container of a campsite to be replaced by a mimic #Range: 0 ~ 100 campsite_mimic_chance = 30 From 3f9f65a8a68fff4c005c546070644a3482e2a4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Wed, 24 Feb 2021 20:59:58 +0100 Subject: [PATCH 05/35] decreased a few spawn weights, fly, racoon, croc --- config/alexsmobs.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/alexsmobs.toml b/config/alexsmobs.toml index 3fa8d42f70..9312133925 100644 --- a/config/alexsmobs.toml +++ b/config/alexsmobs.toml @@ -83,10 +83,10 @@ crocSpawnRolls = 1 #Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn #Range: 0 ~ 1000 - flySpawnWeight = 3 + flySpawnWeight = 2 #Random roll chance to enable mob spawning. Higher number = lower chance of spawning #Range: > 0 - flySpawnRolls = 1 + flySpawnRolls = 2 #Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn #Range: 0 ~ 1000 hummingbirdSpawnWeight = 39 @@ -179,7 +179,7 @@ mimicubeSpawnRolls = 0 #Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn #Range: 0 ~ 1000 - raccoonSpawnWeight = 10 + raccoonSpawnWeight = 3 #Random roll chance to enable mob spawning. Higher number = lower chance of spawning #Range: > 0 raccoonSpawnRolls = 0 @@ -233,7 +233,7 @@ spectreSpawnRolls = 5 #Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn #Range: 0 ~ 1000 - crowSpawnWeight = 10 + crowSpawnWeight = 3 #Random roll chance to enable mob spawning. Higher number = lower chance of spawning #Range: > 0 crowSpawnRolls = 0 From 7128f6944ded5df9c653645d2bf4a2c8997356bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Wed, 24 Feb 2021 21:52:15 +0100 Subject: [PATCH 06/35] fixed #1406 --- config/ftbquests/quests/chapters/storage.snbt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/config/ftbquests/quests/chapters/storage.snbt b/config/ftbquests/quests/chapters/storage.snbt index d8c72fd9aa..c3a309c9a9 100644 --- a/config/ftbquests/quests/chapters/storage.snbt +++ b/config/ftbquests/quests/chapters/storage.snbt @@ -783,13 +783,7 @@ Count: 1b, tag: { inventorySlots: 27, - upgradeSlots: 1, - contentsUuid: [I; - 1681669622, - -476822315, - -1185337849, - -508260231 - ] + upgradeSlots: 1 } }, x: 1.5d, From 0c89c0b8ccf29304713e2dfb98ccb699f66f35df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Wed, 24 Feb 2021 22:18:23 +0100 Subject: [PATCH 07/35] removed rusty iron drop from zombie --- .../loot_tables/entities/zombie.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 kubejs/data/dustrial_decor/loot_tables/entities/zombie.json diff --git a/kubejs/data/dustrial_decor/loot_tables/entities/zombie.json b/kubejs/data/dustrial_decor/loot_tables/entities/zombie.json new file mode 100644 index 0000000000..c4394eea8a --- /dev/null +++ b/kubejs/data/dustrial_decor/loot_tables/entities/zombie.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "rolls": { + "min": 0.0, + "max": 0.0, + "type": "minecraft:uniform" + }, + "entries": [ + + { + "type": "minecraft:empty", + "weight": 1 + } + ] + } + ] +} \ No newline at end of file From 0c846616a1698a491e82c6c43b3af1c7a7164b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Wed, 24 Feb 2021 22:22:42 +0100 Subject: [PATCH 08/35] Update CHANGELOG.md --- changelogs/CHANGELOG.md | 101 ++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 46 deletions(-) diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index 35323cd8b0..4bfb2bcbcd 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -1,58 +1,69 @@ -### Enigmatica 6 v0.4.0 - TerraForged +### Enigmatica 6 v0.4.1 -_Using Forge-1.16.5-36.0.40_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.4.0.txt)_ +_Using Forge-1.16.5-36.0.40_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.4.1.md)_ +**If you're updating from 0.3.x please read the last changelog** +**New Mods!** -You **must** update to a new profile if using the CurseForge App or GDLauncher. This is to clean up old files that we have removed in the update. +**Improvements/Changes** +- Alex's Mobs: Decreased spawning of: + - Fly + - Raccoon + - Crow +- Editing Signs now requires an empty hand +**Bug Fixes** -#### It's highly recommended that you make a new world, to get all the new features. +- Zombies can no longer drop Rusty Iron Ingots +- Signs on chests are now "clicked through" unless you have an empty hand +### Enigmatica 6 v0.4.0 - TerraForged +_Using Forge-1.16.5-36.0.40_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.4.0.md)_ -_We will not be offering support to 0.4.x worlds generated before 0.4.0. See the bottom of the v0.4.0 changelog for a list of possible issues when not making a new world._ +You **must** update to a new profile if using the CurseForge App or GDLauncher. This is to clean up old files that we have removed in the update. +#### It's highly recommended that you make a new world, to get all the new features. +_We will not be offering support to 0.4.x worlds generated before 0.4.0. See the bottom of the v0.4.0 changelog for a list of possible issues when not making a new world._ Lastly, we recommend not changing the default world type as we are using Terraforged with datapacks to provide a custom experience our team has been working on for a while with highly customized terrain and underground. - - **New Mods!** -* [Abnormals Core](https://www.curseforge.com/minecraft/mc-mods/abnormals-core) -* [Atmospheric](https://www.curseforge.com/minecraft/mc-mods/atmospheric) -* [Autumnity](https://www.curseforge.com/minecraft/mc-mods/autumnity) -* [Babel](https://www.curseforge.com/minecraft/mc-mods/babel) -* [BetterEnd (Forge)](https://www.curseforge.com/minecraft/mc-mods/betterend-forge-port) -* [Bountiful](https://www.curseforge.com/minecraft/mc-mods/bountiful) -* [Cloth Config API (Forge)](https://www.curseforge.com/minecraft/mc-mods/cloth-config-forge) -* [Common Capabilities](https://www.curseforge.com/minecraft/mc-mods/common-capabilities) -* [Compact Crafting](https://www.curseforge.com/minecraft/mc-mods/compact-crafting) -* [Compact Machines](https://www.curseforge.com/minecraft/mc-mods/compact-machines) -* [Cyclops Core](https://www.curseforge.com/minecraft/mc-mods/cyclops-core) -* [Diet (Forge)](https://www.curseforge.com/minecraft/mc-mods/diet) -* [Flux Networks](https://www.curseforge.com/minecraft/mc-mods/flux-networks) -* [Integrated Crafting](https://www.curseforge.com/minecraft/mc-mods/integrated-crafting) -* [Integrated Dynamics](https://www.curseforge.com/minecraft/mc-mods/integrated-dynamics) -* [Integrated NBT](https://www.curseforge.com/minecraft/mc-mods/integrated-nbt) -* [Integrated Terminals](https://www.curseforge.com/minecraft/mc-mods/integrated-terminals) -* [Integrated Tunnels](https://www.curseforge.com/minecraft/mc-mods/integrated-tunnels) -* [ItemZoom](https://www.curseforge.com/minecraft/mc-mods/itemzoom) -* [Just Enough Piglin Bartering](https://www.curseforge.com/minecraft/mc-mods/just-enough-piglin-bartering) -* [Just Enough Resources (JER)](https://www.curseforge.com/minecraft/mc-mods/just-enough-resources-jer) -* [Kotlin for Forge](https://www.curseforge.com/minecraft/mc-mods/kotlin-for-forge) -* [Quickstack](https://www.curseforge.com/minecraft/mc-mods/quickstack) -* [Reload Audio Driver (RAD) [Forge]](https://www.curseforge.com/minecraft/mc-mods/reload-audio-driver-rad) -* [Save My Stronghold! (Forge)](https://www.curseforge.com/minecraft/mc-mods/save-my-stronghold) -* [Screenshot to Clipboard (Forge)](https://www.curseforge.com/minecraft/mc-mods/screenshot-to-clipboard) -* [Simple Tomb](https://www.curseforge.com/minecraft/mc-mods/simple-tomb) -* [TerraForged](https://www.curseforge.com/minecraft/mc-mods/terraforged) -* [Tetranomicon](https://www.curseforge.com/minecraft/mc-mods/tetranomicon) -* [Time in a bottle standalone](https://www.curseforge.com/minecraft/mc-mods/time-in-a-bottle-standalone) -* [Upgrade Aquatic](https://www.curseforge.com/minecraft/mc-mods/upgrade-aquatic) +- [Abnormals Core](https://www.curseforge.com/minecraft/mc-mods/abnormals-core) +- [Atmospheric](https://www.curseforge.com/minecraft/mc-mods/atmospheric) +- [Autumnity](https://www.curseforge.com/minecraft/mc-mods/autumnity) +- [Babel](https://www.curseforge.com/minecraft/mc-mods/babel) +- [BetterEnd (Forge)](https://www.curseforge.com/minecraft/mc-mods/betterend-forge-port) +- [Bountiful](https://www.curseforge.com/minecraft/mc-mods/bountiful) +- [Cloth Config API (Forge)](https://www.curseforge.com/minecraft/mc-mods/cloth-config-forge) +- [Common Capabilities](https://www.curseforge.com/minecraft/mc-mods/common-capabilities) +- [Compact Crafting](https://www.curseforge.com/minecraft/mc-mods/compact-crafting) +- [Compact Machines](https://www.curseforge.com/minecraft/mc-mods/compact-machines) +- [Cyclops Core](https://www.curseforge.com/minecraft/mc-mods/cyclops-core) +- [Diet (Forge)](https://www.curseforge.com/minecraft/mc-mods/diet) +- [Flux Networks](https://www.curseforge.com/minecraft/mc-mods/flux-networks) +- [Integrated Crafting](https://www.curseforge.com/minecraft/mc-mods/integrated-crafting) +- [Integrated Dynamics](https://www.curseforge.com/minecraft/mc-mods/integrated-dynamics) +- [Integrated NBT](https://www.curseforge.com/minecraft/mc-mods/integrated-nbt) +- [Integrated Terminals](https://www.curseforge.com/minecraft/mc-mods/integrated-terminals) +- [Integrated Tunnels](https://www.curseforge.com/minecraft/mc-mods/integrated-tunnels) +- [ItemZoom](https://www.curseforge.com/minecraft/mc-mods/itemzoom) +- [Just Enough Piglin Bartering](https://www.curseforge.com/minecraft/mc-mods/just-enough-piglin-bartering) +- [Just Enough Resources (JER)](https://www.curseforge.com/minecraft/mc-mods/just-enough-resources-jer) +- [Kotlin for Forge](https://www.curseforge.com/minecraft/mc-mods/kotlin-for-forge) +- [Quickstack](https://www.curseforge.com/minecraft/mc-mods/quickstack) +- [Reload Audio Driver (RAD) [Forge]](https://www.curseforge.com/minecraft/mc-mods/reload-audio-driver-rad) +- [Save My Stronghold! (Forge)](https://www.curseforge.com/minecraft/mc-mods/save-my-stronghold) +- [Screenshot to Clipboard (Forge)](https://www.curseforge.com/minecraft/mc-mods/screenshot-to-clipboard) +- [Simple Tomb](https://www.curseforge.com/minecraft/mc-mods/simple-tomb) +- [TerraForged](https://www.curseforge.com/minecraft/mc-mods/terraforged) +- [Tetranomicon](https://www.curseforge.com/minecraft/mc-mods/tetranomicon) +- [Time in a bottle standalone](https://www.curseforge.com/minecraft/mc-mods/time-in-a-bottle-standalone) +- [Upgrade Aquatic](https://www.curseforge.com/minecraft/mc-mods/upgrade-aquatic) **Improvements/Changes** @@ -71,7 +82,7 @@ Lastly, we recommend not changing the default world type as we are using Terrafo - This was done to incentivize using other methods that requires more planning, namely IE's Garden Cloche and Thermal's Insolator. - \[Chisels and Bits\] Increase Bit Bag Stack Size [\#1223](https://github.com/NillerMedDild/Enigmatica6/issues/1223) - \[Sugestion\] Balance Power Generation [\#861](https://github.com/NillerMedDild/Enigmatica6/issues/861) -- Better End : The Taggening - Add basic tags to many items/blocks from better end [\#1313](https://github.com/NillerMedDild/Enigmatica6/pull/1313) ([MuteTiefling](https://github.com/MuteTiefling)) +- Better End : The Taggening - Add basic tags to many items/blocks from better end [\#1313](https://github.com/NillerMedDild/Enigmatica6/pull/1313) ([MuteTiefling](https://github.com/MuteTiefling)) - Better End Compat [\#1276](https://github.com/NillerMedDild/Enigmatica6/issues/1276) - Better End Ender Ore and Amber Ore Processing Integration [\#1320](https://github.com/NillerMedDild/Enigmatica6/pull/1320) ([MuteTiefling](https://github.com/MuteTiefling)) - Chisels&Bits: Increased Bit Bag stack size to 16384 (32 times what it could hold before) @@ -83,7 +94,7 @@ Lastly, we recommend not changing the default world type as we are using Terrafo - ID Ore Unification - Ores to Dust | Ingots/Gems to Dust [\#1307](https://github.com/NillerMedDild/Enigmatica6/pull/1307) ([MuteTiefling](https://github.com/MuteTiefling)) - IF Laser Lens [\#1206](https://github.com/NillerMedDild/Enigmatica6/issues/1206) - LostTrinkets: Set maximum number of trinket slots the player can have to 10 -- Magic Feather and Angel Ring [\#1167](https://github.com/NillerMedDild/Enigmatica6/issues/1167) +- Magic Feather and Angel Ring [\#1167](https://github.com/NillerMedDild/Enigmatica6/issues/1167) - Move Mimiccream to Mimic drop table [\#1382](https://github.com/NillerMedDild/Enigmatica6/pull/1382) ([MuteTiefling](https://github.com/MuteTiefling)) - New Panorama and Main Menu [\#1348](https://github.com/NillerMedDild/Enigmatica6/pull/1348) ([Ridanisaurus](https://github.com/Ridanisaurus)) - Possible list of structure datapacks [\#1269](https://github.com/NillerMedDild/Enigmatica6/issues/1269) @@ -114,13 +125,13 @@ Lastly, we recommend not changing the default world type as we are using Terrafo - Farmers Delight Cooking Pot Recipes [\#1238](https://github.com/NillerMedDild/Enigmatica6/issues/1238) - Gloomgourd can't be cultivated in Botany Pots [\#1153](https://github.com/NillerMedDild/Enigmatica6/issues/1153) - Hellish Zombee have no flowers [\#1189](https://github.com/NillerMedDild/Enigmatica6/issues/1189) -- IE Garden Cloche does not accept Phyto-grow [\#1160](https://github.com/NillerMedDild/Enigmatica6/issues/1160) +- IE Garden Cloche does not accept Phyto-grow [\#1160](https://github.com/NillerMedDild/Enigmatica6/issues/1160) - Item Dup Exploit: Mimicubes drop mimicked items if you have the Octopus Leg lost trinket equipped. [\#1281](https://github.com/NillerMedDild/Enigmatica6/issues/1281) - It is a downgrade to put vanilla bees in tier 3 apiary, compared to tier 2 [\#1175](https://github.com/NillerMedDild/Enigmatica6/issues/1175) - Lootr Chests/barrels not appear in the Campsites added by Artifact's mod [\#1230](https://github.com/NillerMedDild/Enigmatica6/issues/1230) - Mekanism Oredictionifcator Doesn't Appreciate Certain Tags [\#1110](https://github.com/NillerMedDild/Enigmatica6/issues/1110) - Mekanism Teleporter in the Nether [\#982](https://github.com/NillerMedDild/Enigmatica6/issues/982) -- minecraft:flower\_pot becomes invisible with flowers from byg mod [\#729](https://github.com/NillerMedDild/Enigmatica6/issues/729) +- minecraft:flower_pot becomes invisible with flowers from byg mod [\#729](https://github.com/NillerMedDild/Enigmatica6/issues/729) - Mod guidebooks not placeable on Builder's Addition bookshelves [\#1069](https://github.com/NillerMedDild/Enigmatica6/issues/1069) - Morph-o-tool not switching to RFTools wrench when looking at RFtools blocks [\#1349](https://github.com/NillerMedDild/Enigmatica6/issues/1349) - Occultism Create crash [\#1314](https://github.com/NillerMedDild/Enigmatica6/issues/1314) @@ -129,7 +140,7 @@ Lastly, we recommend not changing the default world type as we are using Terrafo - Reproducible crash with Backtools and Seals [\#1158](https://github.com/NillerMedDild/Enigmatica6/issues/1158) - Returning to main menu immediately leads to the multiplayer menu [\#1079](https://github.com/NillerMedDild/Enigmatica6/issues/1079) - Save Your Pets interferes with Occultism drikwing summoning method. [\#1293](https://github.com/NillerMedDild/Enigmatica6/issues/1293) -- Server-Crash because of Ars\_Nouveau [\#1295](https://github.com/NillerMedDild/Enigmatica6/issues/1295) +- Server-Crash because of Ars_Nouveau [\#1295](https://github.com/NillerMedDild/Enigmatica6/issues/1295) - Some Eidolon recipes hidden in JEI on servers [\#1130](https://github.com/NillerMedDild/Enigmatica6/issues/1130) - Some Mekanism fluid recipes are not shown in JEI when using "Show Use" Key. [\#947](https://github.com/NillerMedDild/Enigmatica6/issues/947) - Some Servers Do Not Show Up Correctly On Client [\#824](https://github.com/NillerMedDild/Enigmatica6/issues/824) @@ -138,7 +149,7 @@ Lastly, we recommend not changing the default world type as we are using Terrafo - Tetra's hammer not creatable with BYG Cika planks/hammers not searchable in JEI [\#1339](https://github.com/NillerMedDild/Enigmatica6/issues/1339) - Tetra crash/freeze when placing forge hammer [\#916](https://github.com/NillerMedDild/Enigmatica6/issues/916) - Tetra Extractor Unification [\#1245](https://github.com/NillerMedDild/Enigmatica6/issues/1245) -- Thermal packing/unpacking Comb recipes and Vanilla Comb 3x3 [\#1303](https://github.com/NillerMedDild/Enigmatica6/pull/1303) ([Merlo17](https://github.com/Merlo17)) +- Thermal packing/unpacking Comb recipes and Vanilla Comb 3x3 [\#1303](https://github.com/NillerMedDild/Enigmatica6/pull/1303) ([Merlo17](https://github.com/Merlo17)) - Travel anchor oddity [\#1111](https://github.com/NillerMedDild/Enigmatica6/issues/1111) - Typo in Mekanism Wind Generator quest [\#1161](https://github.com/NillerMedDild/Enigmatica6/issues/1161) - Undergarden mushrooms can't be placed in Deepsoil in Botany Pots [\#1151](https://github.com/NillerMedDild/Enigmatica6/issues/1151) @@ -147,8 +158,6 @@ Lastly, we recommend not changing the default world type as we are using Terrafo - Wrong EE ore being chosen for outputs [\#1266](https://github.com/NillerMedDild/Enigmatica6/issues/1266) - You can keep re-looting Lootr chests that are in minecarts. [\#1165](https://github.com/NillerMedDild/Enigmatica6/issues/1165) - - **Some of the possible issues when updating an old world** - Refined Storage Extra Disks have been moved to a new mod, so existing disks will vanish. From 67c1c1ed664c379e5d06da72a48c766a9d5b6464 Mon Sep 17 00:00:00 2001 From: Matteo Merler Date: Wed, 24 Feb 2021 22:34:11 +0100 Subject: [PATCH 09/35] Added tags to backpacks to use in quest hand-ins --- .../base/tags/items/sophisticatedbackpacks/backpacks.js | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 kubejs/server_scripts/enigmatica/kubejs/base/tags/items/sophisticatedbackpacks/backpacks.js diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/sophisticatedbackpacks/backpacks.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/sophisticatedbackpacks/backpacks.js new file mode 100644 index 0000000000..0de3b081f9 --- /dev/null +++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/sophisticatedbackpacks/backpacks.js @@ -0,0 +1,9 @@ +events.listen('item.tags', (event) => { + event.add('sophisticatedbackpacks:base_backpack', 'sophisticatedbackpacks:backpack'); + + event.add('sophisticatedbackpacks:iron_backpack', 'sophisticatedbackpacks:iron_backpack'); + + event.add('sophisticatedbackpacks:gold_backpack', 'sophisticatedbackpacks:gold_backpack'); + + event.add('sophisticatedbackpacks:diamond_backpack', 'sophisticatedbackpacks:diamond_backpack'); +}); \ No newline at end of file From f7edef6c2de1b83ac934287d823d745b9606d293 Mon Sep 17 00:00:00 2001 From: theboo Date: Wed, 24 Feb 2021 18:20:45 -0800 Subject: [PATCH 10/35] Removed otherstone recipe, occultism now adds its own --- .../base/recipetypes/occultism/spirit_fire.js | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/spirit_fire.js diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/spirit_fire.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/spirit_fire.js deleted file mode 100644 index f4e3b71f59..0000000000 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/spirit_fire.js +++ /dev/null @@ -1,24 +0,0 @@ -events.listen('recipes', (event) => { - data = { - recipes: [ - { - input: 'forge:stone', - result: 'occultism:otherstone' - } - ] - }; - - data.recipes.forEach((recipe) => { - event.custom({ - type: 'occultism:spirit_fire', - ingredient: [ - { - tag: recipe.input - } - ], - result: { - item: recipe.result - } - }); - }); -}); From e226d5433d7fe5a89a1f2aa879b30e0e4f8003cd Mon Sep 17 00:00:00 2001 From: theboo Date: Wed, 24 Feb 2021 21:11:16 -0800 Subject: [PATCH 11/35] adds crafting materials tag to beach grasses --- .../kubejs/base/tags/items/forge/crafting_materials.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/crafting_materials.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/crafting_materials.js index 579fe0608d..b1d6fee6f8 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/crafting_materials.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/crafting_materials.js @@ -5,4 +5,8 @@ events.listen('item.tags', (event) => { .add('botania:mana_diamond') .add('titanium:diamond_gear') .add('minecraft:diamond_block'); + event + .get('enigmatica:crafting_materials/beach_grass') + .add('byg:beach_grass') + .add('upgrade_aquatic:beachgrass'); }); From 84a766b2b31688208b6a6489331b0ede1a34e39f Mon Sep 17 00:00:00 2001 From: theboo Date: Wed, 24 Feb 2021 21:13:58 -0800 Subject: [PATCH 12/35] changes recipe for upgradeaquatic thatch materials to use new tag --- .../enigmatica/kubejs/base/recipes/replace_input.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/replace_input.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/replace_input.js index 2e93c07685..c261c987a1 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/replace_input.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/replace_input.js @@ -21,6 +21,7 @@ events.listen('recipes', (event) => { event.replaceInput({}, 'betterendforge:ender_dust', '#forge:dusts/ender'); event.replaceInput({}, 'minecraft:iron_ore', '#forge:ores/iron'); event.replaceInput({}, 'minecraft:gold_ore', '#forge:ores/gold'); + event.replaceInput({}, 'upgrade_aquatic:beachgrass', '#enigmatica:crafting_materials/beach_grass'); event.replaceInput({ type: 'minecraft:crafting_shaped' }, 'powah:uraninite', '#forge:ingots/radioactive'); event.replaceInput({ id: 'tetra:hammer/stone' }, 'minecraft:cobblestone', '#quark:stone_tool_materials'); event.replaceInput({ id: 'dustrial_decor:sheet_metal' }, '#forge:ingots/iron', '#forge:plates/iron'); From 7fc2536d98d9e2355ebef70679ae636b9d7eec98 Mon Sep 17 00:00:00 2001 From: theboo Date: Wed, 24 Feb 2021 21:16:06 -0800 Subject: [PATCH 13/35] adds byg:reeds to growables wasn't exactly sure which type to put this in, so it goes here --- kubejs/server_scripts/enigmatica/kubejs/constants/crops.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js b/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js index 7c4d66efd8..2540993fe9 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js +++ b/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js @@ -1781,6 +1781,12 @@ const cropRegistry = [ render: 'upgrade_aquatic:beachgrass', plant: 'upgrade_aquatic:beachgrass', substrate: 'dirt' + }, + { + seed: 'byg:reeds', + render: 'byg:reeds', + plant: 'byg:reeds', + substrate: 'water' } ] }, From ac2fea2347ebae0fe06c27afe3e918b6d0f0918b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 06:45:57 +0100 Subject: [PATCH 14/35] Update astral_sorcery_wip.snbt --- config/ftbquests/quests/chapters/astral_sorcery_wip.snbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/astral_sorcery_wip.snbt b/config/ftbquests/quests/chapters/astral_sorcery_wip.snbt index 924fb35bc2..5d87b2104e 100644 --- a/config/ftbquests/quests/chapters/astral_sorcery_wip.snbt +++ b/config/ftbquests/quests/chapters/astral_sorcery_wip.snbt @@ -585,7 +585,7 @@ }] }, { - title: "Nocturnal & Illumination Powder", + title: "Nocturnal \\& Illumination Powder", x: 8.5d, y: -9.5d, subtitle: "Letting the Dust Settle", From 2a8bab8d1eeb1842f9254b1e9f95ba38974eeddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 06:46:02 +0100 Subject: [PATCH 15/35] Update botania.snbt --- config/ftbquests/quests/chapters/botania.snbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/botania.snbt b/config/ftbquests/quests/chapters/botania.snbt index 9221d03d5b..0ceefd7c83 100644 --- a/config/ftbquests/quests/chapters/botania.snbt +++ b/config/ftbquests/quests/chapters/botania.snbt @@ -151,7 +151,7 @@ ] }, { - title: "Livingwood & Livingrock", + title: "Livingwood \\& Livingrock", x: -3.0d, y: 3.5d, subtitle: "Breathing New Life", @@ -967,6 +967,7 @@ }] }, { + title: "Sparks", x: 7.0d, y: 1.5d, subtitle: "Taking the Gloves Off", From e758136c43b88d313d1338f5ab02e8463071ac8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 06:46:44 +0100 Subject: [PATCH 16/35] fixes #1403 --- .../ftbquests/quests/chapters/mekanism.snbt | 248 +++++++++++++++++- 1 file changed, 236 insertions(+), 12 deletions(-) diff --git a/config/ftbquests/quests/chapters/mekanism.snbt b/config/ftbquests/quests/chapters/mekanism.snbt index 21f4a72372..4595ffffaa 100644 --- a/config/ftbquests/quests/chapters/mekanism.snbt +++ b/config/ftbquests/quests/chapters/mekanism.snbt @@ -285,7 +285,35 @@ tasks: [{ id: "00000000000006BE", type: "item", - item: "mekanism:metallurgic_infuser" + title: "Metallurgic Infuser", + item: { + id: "itemfilters:or", + Count: 1b, + tag: { + items: [ + { + id: "mekanism:basic_infusing_factory", + Count: 1b + }, + { + id: "mekanism:advanced_infusing_factory", + Count: 1b + }, + { + id: "mekanism:elite_infusing_factory", + Count: 1b + }, + { + id: "mekanism:ultimate_infusing_factory", + Count: 1b + }, + { + id: "mekanism:metallurgic_infuser", + Count: 1b + } + ] + } + } }], rewards: [ { @@ -321,7 +349,35 @@ tasks: [{ id: "00000000000006C0", type: "item", - item: "mekanism:enrichment_chamber" + title: "Enrichment Chamber", + item: { + id: "itemfilters:or", + Count: 1b, + tag: { + items: [ + { + id: "mekanism:basic_enriching_factory", + Count: 1b + }, + { + id: "mekanism:advanced_enriching_factory", + Count: 1b + }, + { + id: "mekanism:elite_enriching_factory", + Count: 1b + }, + { + id: "mekanism:ultimate_enriching_factory", + Count: 1b + }, + { + id: "mekanism:enrichment_chamber", + Count: 1b + } + ] + } + } }], rewards: [ { @@ -356,7 +412,35 @@ tasks: [{ id: "00000000000006C2", type: "item", - item: "mekanism:crusher" + title: "Crusher", + item: { + id: "itemfilters:or", + Count: 1b, + tag: { + items: [ + { + id: "mekanism:basic_crushing_factory", + Count: 1b + }, + { + id: "mekanism:advanced_crushing_factory", + Count: 1b + }, + { + id: "mekanism:elite_crushing_factory", + Count: 1b + }, + { + id: "mekanism:ultimate_crushing_factory", + Count: 1b + }, + { + id: "mekanism:crusher", + Count: 1b + } + ] + } + } }], rewards: [ { @@ -409,7 +493,35 @@ tasks: [{ id: "00000000000006C6", type: "item", - item: "mekanism:osmium_compressor" + title: "Osmium Compressor", + item: { + id: "itemfilters:or", + Count: 1b, + tag: { + items: [ + { + id: "mekanism:basic_compressing_factory", + Count: 1b + }, + { + id: "mekanism:advanced_compressing_factory", + Count: 1b + }, + { + id: "mekanism:elite_compressing_factory", + Count: 1b + }, + { + id: "mekanism:ultimate_compressing_factory", + Count: 1b + }, + { + id: "mekanism:osmium_compressor", + Count: 1b + } + ] + } + } }], rewards: [ { @@ -554,24 +666,136 @@ item: "mekanism:electrolytic_separator" }, { - id: "00000000000006E5", + id: "584EA4C1CB7A2268", type: "item", - item: "mekanism:purification_chamber" + title: "Purification Chamber", + item: { + id: "itemfilters:or", + Count: 1b, + tag: { + items: [ + { + id: "mekanism:basic_purifying_factory", + Count: 1b + }, + { + id: "mekanism:advanced_purifying_factory", + Count: 1b + }, + { + id: "mekanism:elite_purifying_factory", + Count: 1b + }, + { + id: "mekanism:ultimate_purifying_factory", + Count: 1b + }, + { + id: "mekanism:purification_chamber", + Count: 1b + } + ] + } + } }, { - id: "00000000000006E6", + id: "2292FFBA8D9C5E76", type: "item", - item: "mekanism:crusher" + title: "Crusher", + item: { + id: "itemfilters:or", + Count: 1b, + tag: { + items: [ + { + id: "mekanism:basic_crushing_factory", + Count: 1b + }, + { + id: "mekanism:advanced_crushing_factory", + Count: 1b + }, + { + id: "mekanism:elite_crushing_factory", + Count: 1b + }, + { + id: "mekanism:ultimate_crushing_factory", + Count: 1b + }, + { + id: "mekanism:crusher", + Count: 1b + } + ] + } + } }, { - id: "00000000000006E7", + id: "731C1D72D3C19800", type: "item", - item: "mekanism:enrichment_chamber" + title: "Enrichment Chamber", + item: { + id: "itemfilters:or", + Count: 1b, + tag: { + items: [ + { + id: "mekanism:basic_enriching_factory", + Count: 1b + }, + { + id: "mekanism:advanced_enriching_factory", + Count: 1b + }, + { + id: "mekanism:elite_enriching_factory", + Count: 1b + }, + { + id: "mekanism:ultimate_enriching_factory", + Count: 1b + }, + { + id: "mekanism:enrichment_chamber", + Count: 1b + } + ] + } + } }, { - id: "00000000000006E8", + id: "183415D2ACD363E7", type: "item", - item: "mekanism:energized_smelter" + title: "Energized Smelter", + item: { + id: "itemfilters:or", + Count: 1b, + tag: { + items: [ + { + id: "mekanism:basic_smelting_factory", + Count: 1b + }, + { + id: "mekanism:advanced_smelting_factory", + Count: 1b + }, + { + id: "mekanism:elite_smelting_factory", + Count: 1b + }, + { + id: "mekanism:ultimate_smelting_factory", + Count: 1b + }, + { + id: "mekanism:energized_smelter", + Count: 1b + } + ] + } + } } ], rewards: [ From d1aae0d95e67bd2014bc197591994adc318f002c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 06:46:58 +0100 Subject: [PATCH 17/35] Update occultism.snbt --- .../ftbquests/quests/chapters/occultism.snbt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/config/ftbquests/quests/chapters/occultism.snbt b/config/ftbquests/quests/chapters/occultism.snbt index 67397c5fbd..57d50dbef9 100644 --- a/config/ftbquests/quests/chapters/occultism.snbt +++ b/config/ftbquests/quests/chapters/occultism.snbt @@ -95,7 +95,7 @@ description: [ "The Divination Rod is used to locate the otherworldy materials that lie dormant in this world.", "", - "To use the rod, first you must attune it to a material by right clicking a block. Attuning the rod to oak logs to search for otherwood disguised as oak trees, andesite for otherstone.", + "To use the rod, first you must attune it to a material by sneak-right clicking a block. Attuning the rod to oak logs to search for otherwood disguised as oak trees, andesite for otherstone.", "", "After the rod has been attuned, simply hold right click until the animation and sound stops. Part of the white crystal will remain purple if you are near any otherworldly materials. It will also highlight the block it found in the world.", "", @@ -103,7 +103,7 @@ "", "If you are having troubles finding these materials through divination, we have added ways for you to create these materials yourself.", "", - "Othestone can be crafted by throwing stone in to spirit fire, and otherwood can be acquired by trading a spirit gem with the Farming for Blockheads market villager. It will be disguised as a regular oak tree, look for the occultism tag.", + "Othestone can be crafted by throwing andesite in to spirit fire, and otherwood can be acquired by throwing an oak sapling into the spirit flame and planting the resulting unstable sapling/harvesting the wood.", "", "P.S. Sorry for the novel... -The_Boo" ], @@ -1154,7 +1154,11 @@ x: 2.0d, y: 5.5d, shape: "hexagon", - description: ["The Djinni Mining Spirit is much stronger than its Foliot counterpart. It takes much less time for this stonger spirit to travel to and from the mining dimension, and it can bring back more ores each trip!"], + description: [ + "The Djinni Mining Spirit is much stronger than its Foliot counterpart. It takes much less time for this stonger spirit to travel to and from the mining dimension, and it can bring back more ores each trip!", + "", + "The durability of this miner has been boosted in this pack, you will not see this change until the miner loses its first point of durability in the mineshaft." + ], dependencies: ["0000000000000DCC"], id: "0000000000000DCE", tasks: [{ @@ -1459,7 +1463,7 @@ "", "The Wild Hunt Ritual will summon multiple possessed Wither Skeletons as well as their Possessed Skeleton minions. Each Possessed Wither Skeleton is guaranteed to drop at least one Wither Skeleton Skull.", "", - "These Wither Skeletons also have a chance of droping some extra loot!!!" + "These Wither Skeletons also have a chance of dropping some extra loot!!!" ], dependencies: ["0000000000000D9E"], id: "0000000000000DE4", @@ -1534,7 +1538,7 @@ description: [ "The Otherworld Sapling Trader will take the Unstable Otherworld Saplings you get from Groves or the Market and give you stable saplings in return.", "", - "These Stable Otherworld Saplings can be seen and mined without the effects of Third Eye." + "These Stable Otherworld Saplings can be seen and harvested without the effects of Third Eye." ], dependencies: ["0000000000000CF7"], id: "0000000000000E00", @@ -1705,7 +1709,9 @@ description: [ "The occultist is also able to summon familiars to assist them on their journey.", "", - "The Drikwing is an otherworldly bird that imparts special effects on its master when close." + "The Drikwing is an otherworldly bird that imparts special effects on its master when close.", + "", + "Tip: There is a ritual you can use to summon a wild parrot that can make the sacrifice needed for this ritual much easier." ], dependencies: ["0000000000000D9E"], id: "0000000000000F3C", From ae01980609618866040a6088dfc3333522455268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 08:41:39 +0100 Subject: [PATCH 18/35] mod updates --- config/ferritecore-mixin.toml | 6 + config/pneumaticcraft-common.toml | 4 + config/quark-common.toml | 14 +- config/serverconfigupdater-common.toml | 2 +- config/sophisticatedbackpacks-common.toml | 11 +- config/terraforged/general.conf | 9 +- config/terraforged/performance_internal.conf | 4 +- minecraftinstance.json | 909 ++++++++----------- 8 files changed, 426 insertions(+), 533 deletions(-) diff --git a/config/ferritecore-mixin.toml b/config/ferritecore-mixin.toml index 8450015688..d88c20bfa8 100644 --- a/config/ferritecore-mixin.toml +++ b/config/ferritecore-mixin.toml @@ -8,4 +8,10 @@ cacheMultipartPredicates = true modelResourceLocations = true #Do not create a new MultipartBakedModel instance for each block state using the same multipartmodel. Requires cacheMultipartPredicates to be enabled multipartDeduplication = true +#Deduplicate cached data for blockstates, most importantly collision and render shapes +blockstateCacheDeduplication = true +#Deduplicate vertex data of baked quads in the basic model implementations +bakedQuadDeduplication = true +#Use a slightly more compact, but also slightly slower representation for block states +compactFastMap = false diff --git a/config/pneumaticcraft-common.toml b/config/pneumaticcraft-common.toml index d12e7009e2..967ddc7696 100644 --- a/config/pneumaticcraft-common.toml +++ b/config/pneumaticcraft-common.toml @@ -85,6 +85,10 @@ #Changing this value will alter the hydraulic bar production of the Pneumatic Pump. The input, air, will stay the same #Range: > 0 pneumatic_pump_efficiency = 40 + #Fluid registry ID's that the Seismic Sensor will search for. It's recommended to use 'seismicSensorFluidTags' where possible, but this setting can be used if you want to add fluids which don't have any associated fluid tags. + seismic_sensor_fluids = [] + #Fluid tag names that the Seismic Sensor will search for. Known vanilla tags are 'minecraft:water' and 'minecraft:lava'. Other available fluid tags are mod-dependent. + seismic_sensor_fluid_tags = ["forge:crude_oil"] ["Pneumatic Armor"] #Air usage for armor repair, in mL per Item Life Upgrade per point of damage repaired diff --git a/config/quark-common.toml b/config/quark-common.toml index 392ef073c5..d754dd4507 100644 --- a/config/quark-common.toml +++ b/config/quark-common.toml @@ -9,8 +9,6 @@ #A list of screens that don't play well with quark's buttons. Use "Print Screen Classnames" to find the names of any others you'd want to add. "Ignored Screens" = ["com.tfar.craftingstation.client.CraftingStationScreen", "com.refinedmods.refinedstorage.screen.grid.GridScreen", "appeng.client.gui.implementations.CraftingTermScreen", "appeng.client.gui.implementations.PatternTermScreen", "blusunrize.immersiveengineering.client.gui.CraftingTableScreen", "wile.engineersdecor.blocks.EdCraftingTable$CraftingTableGui", "me.desht.pneumaticcraft.client.gui.semiblock.GuiLogisticsRequester", "me.desht.pneumaticcraft.client.gui.semiblock.GuiLogisticsStorage", "me.desht.pneumaticcraft.client.gui.semiblock.GuiLogisticsProvider", "me.desht.modularrouters.client.gui.filter.GuiFilterScreen", "com.resourcefulbees.resourcefulbees.client.gui.screen.CentrifugeScreen", "com.resourcefulbees.resourcefulbees.client.gui.screen.MechanicalCentrifugeScreen", "com.resourcefulbees.resourcefulbees.client.gui.screen.CentrifugeMultiblockScreen", "com.refinedmods.refinedstorage.screen.FilterScreen"] "Use Anti Overlap" = true - #Quark messes with the Stonecutter to allow any item that can be used in it to be shift clicked in. Set this to false to turn it off. - "Hack Stonecutter Shift Click" = true #Enables quark network profiling features. Do not enable this unless requested to. "Enable Network Profiling" = false #Quark replaces the Piston logic to allow for its piston features to work. If you're having troubles, try turning this off. @@ -680,7 +678,7 @@ [world.new_stone_types.marble.oregen] #Allowed values: [0,255] - "Max Height" = 256 + "Max Height" = 255 #Allowed values: [0,) "Cluster Count" = 0 #Allowed values: [0,255] @@ -696,7 +694,7 @@ [world.new_stone_types.limestone.oregen] #Allowed values: [0,255] - "Max Height" = 256 + "Max Height" = 255 #Allowed values: [0,) "Cluster Count" = 0 #Allowed values: [0,255] @@ -712,7 +710,7 @@ [world.new_stone_types.voidstone.oregen] #Allowed values: [0,255] - "Max Height" = 256 + "Max Height" = 255 #Allowed values: [0,) "Cluster Count" = 0 #Allowed values: [0,255] @@ -728,7 +726,7 @@ [world.new_stone_types.slate.oregen] #Allowed values: [0,255] - "Max Height" = 256 + "Max Height" = 255 #Allowed values: [0,) "Cluster Count" = 0 #Allowed values: [0,255] @@ -744,7 +742,7 @@ [world.new_stone_types.jasper.oregen] #Allowed values: [0,255] - "Max Height" = 256 + "Max Height" = 255 #Allowed values: [0,) "Cluster Count" = 0 #Allowed values: [0,255] @@ -766,7 +764,7 @@ #Allowed values: [0,255] "Min Height" = 0 #Allowed values: [0,255] - "Max Height" = 256 + "Max Height" = 255 #Allowed values: [0,) "Cluster Size" = 33 #Allowed values: [0,) diff --git a/config/serverconfigupdater-common.toml b/config/serverconfigupdater-common.toml index e65813d12f..3646efbf74 100644 --- a/config/serverconfigupdater-common.toml +++ b/config/serverconfigupdater-common.toml @@ -10,7 +10,7 @@ #By default Folders are only deleted if they are empty. Set to true to change that. deleteFoldersWithContent = false #This is intended for deleting datapacks and/or craft tweaker scripts. The file will be deleted every launch if it exists! No access to saves or world folder. Specify the path to the file. Comma Separated List. Example: scripts/badscript.zs - filesToDelete = "" + filesToDelete = "kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/spirit_fire.js" ["Version History"] #Editing these values will not affect any worlds that are already on that version. diff --git a/config/sophisticatedbackpacks-common.toml b/config/sophisticatedbackpacks-common.toml index a11fa913ae..16ad9bafe2 100644 --- a/config/sophisticatedbackpacks-common.toml +++ b/config/sophisticatedbackpacks-common.toml @@ -239,5 +239,14 @@ #Turns on/off buffing the entity that wears backpack with potion effects. These are scaled based on how much loot is added. buffWithPotionEffects = true #Map of entities that can spawn with backpack and related loot tables (if adding a loot is enabled) in format of "EntityRegistryName|LootTableName - entityLootTableList = ["minecraft:enderman|minecraft:chests/end_city_treasure", "minecraft:wither_skeleton|minecraft:chests/nether_bridge", "minecraft:piglin_brute|minecraft:chests/bastion_treasure", "minecraft:witch|minecraft:chests/buried_treasure", "minecraft:zombie|minecraft:chests/simple_dungeon", "minecraft:drowned|minecraft:chests/shipwreck_treasure", "minecraft:evoker|minecraft:chests/woodland_mansion", "minecraft:zombie_villager|minecraft:chests/village/village_armorer", "minecraft:vindicator|minecraft:chests/woodland_mansion", "minecraft:pillager|minecraft:chests/pillager_outpost", "minecraft:creeper|minecraft:chests/desert_pyramid", "minecraft:zombified_piglin|minecraft:chests/bastion_other", "minecraft:stray|minecraft:chests/igloo_chest", "minecraft:piglin|minecraft:chests/bastion_bridge", "minecraft:skeleton|minecraft:chests/simple_dungeon", "minecraft:husk|minecraft:chests/desert_pyramid", "minecraft:vex|minecraft:chests/woodland_mansion"] + entityLootTableList = ["minecraft:enderman|minecraft:chests/end_city_treasure", "minecraft:piglin|minecraft:chests/bastion_bridge", "minecraft:piglin_brute|minecraft:chests/bastion_treasure", "minecraft:creeper|minecraft:chests/desert_pyramid", "minecraft:drowned|minecraft:chests/shipwreck_treasure", "minecraft:stray|minecraft:chests/igloo_chest", "minecraft:evoker|minecraft:chests/woodland_mansion", "minecraft:husk|minecraft:chests/desert_pyramid", "minecraft:zombie|minecraft:chests/simple_dungeon", "minecraft:witch|minecraft:chests/buried_treasure", "minecraft:pillager|minecraft:chests/pillager_outpost", "minecraft:zombified_piglin|minecraft:chests/bastion_other", "minecraft:zombie_villager|minecraft:chests/village/village_armorer", "minecraft:skeleton|minecraft:chests/simple_dungeon", "minecraft:wither_skeleton|minecraft:chests/nether_bridge", "minecraft:vindicator|minecraft:chests/woodland_mansion", "minecraft:vex|minecraft:chests/woodland_mansion"] + + #Netherite Backpack Settings + [common.netheriteBackpack] + #Number of inventory slots in the backpack + #Range: 1 ~ 144 + inventorySlotCount = 120 + #Number of upgrade slots in the backpack + #Range: 0 ~ 10 + upgradeSlotCount = 7 diff --git a/config/terraforged/general.conf b/config/terraforged/general.conf index fea90ed753..4e4c499714 100644 --- a/config/terraforged/general.conf +++ b/config/terraforged/general.conf @@ -1,11 +1,16 @@ # The version of this config. Do not edit (it'll wipe your settings!) -version = "1.0" -# Set the preset to use when creating a new world +version = "1.1" +# Set the preset to use when creating a new world. default_preset = "Enigmatica" # Set whether tooltips should be displayed by default in the config gui. tooltips = true # Set whether coordinates should be displayed by default in the config gui. coords = true +# Set whether multiple threads should be used to perform structure searches. +# This can greatly increase the speed of finding structures via the /locate command. +async_structure_search = true +# Set the number of milliseconds that a structure search can run for before it is aborted. +structure_search_timeout = 5000 # The number of milliseconds a single feature/structure can generate for before a warning # is printed to the logs. This may help track down mods that are causing world-gen to run slow. # Set to -1 to disable. diff --git a/config/terraforged/performance_internal.conf b/config/terraforged/performance_internal.conf index a6572891ee..a67ce264df 100644 --- a/config/terraforged/performance_internal.conf +++ b/config/terraforged/performance_internal.conf @@ -1,12 +1,12 @@ # The version of this config. Do not edit (it'll wipe your settings!) -version = "1.0" +version = "1.1" # Controls the total number of threads that will be used to generate heightmap tiles. # Allowing the generator to use more threads can help speed up generation but increases overall # load on your CPU which may adversely affect performance in other areas of the game engine. thread_count = 10 # Controls the size of heightmap tiles. # Smaller tiles are faster to generate but less memory efficient. -tile_size = 3 +tile_size = 2 # Batching breaks heightmap tiles up into smaller pieces that can be generated concurrently. # This can help improve generation speed by utilizing more threads. # It is more effective when a higher thread count (+6) is available. diff --git a/minecraftinstance.json b/minecraftinstance.json index 749d131ac2..5aab88c937 100644 --- a/minecraftinstance.json +++ b/minecraftinstance.json @@ -30,7 +30,7 @@ "isUnlocked": true, "javaArgsOverride": null, "javaDirOverride": null, - "lastPlayed": "2021-02-23T16:27:22.2580434Z", + "lastPlayed": "2021-02-25T07:24:22.8641762Z", "manifest": null, "fileDate": "0001-01-01T00:00:00", "installedModpack": null, @@ -46,7 +46,7 @@ "name": "Enigmatica6", "cachedScans": [], "isValid": true, - "lastPreviousMatchUpdate": "2021-02-23T16:24:01.0361195Z", + "lastPreviousMatchUpdate": "2021-02-25T07:24:20.0885987Z", "isEnabled": true, "isPinned": false, "gameVersion": "1.16.5", @@ -2878,28 +2878,28 @@ "alternateFileId": 0, "dependencies": [ { - "id": 0, + "id": 56893632, "addonId": 233105, "type": 3, - "fileId": 0 + "fileId": 3204848 }, { - "id": 0, + "id": 56893629, "addonId": 326041, "type": 3, - "fileId": 0 + "fileId": 3204848 }, { - "id": 0, + "id": 56893631, "addonId": 270789, "type": 2, - "fileId": 0 + "fileId": 3204848 }, { - "id": 0, + "id": 56893630, "addonId": 245211, "type": 2, - "fileId": 0 + "fileId": 3204848 } ], "isAvailable": true, @@ -2907,31 +2907,31 @@ { "foldername": "META-INF", "fingerprint": 3722801021, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "mcjty", "fingerprint": 3721823445, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "assets", "fingerprint": 3017503861, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 2052052530, - "type": 0, + "type": 3, "invalidFingerprint": false }, { "foldername": "data", "fingerprint": 4098685820, - "type": 0, + "type": 3, "invalidFingerprint": false } ], @@ -2942,21 +2942,51 @@ "Forge", "1.16.4" ], + "sortableGameVersion": [ + { + "gameVersionPadded": "0000000001.0000000016.0000000003", + "gameVersion": "1.16.3", + "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z", + "gameVersionName": "1.16.3" + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000005", + "gameVersion": "1.16.5", + "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", + "gameVersionName": "1.16.5" + }, + { + "gameVersionPadded": "0", + "gameVersion": "", + "gameVersionReleaseDate": "2019-08-01T00:00:00Z", + "gameVersionName": "Forge" + }, + { + "gameVersionPadded": "0000000001.0000000016.0000000004", + "gameVersion": "1.16.4", + "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", + "gameVersionName": "1.16.4" + } + ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, + "categorySectionPackageType": 6, + "restrictProjectFileAccess": 1, + "projectStatus": 4, + "renderCacheId": 2173433, + "projectId": 342466, + "packageFingerprintId": 606152015, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameId": 0, + "gameVersionMappingId": 2724313, + "gameVersionId": 4458, + "gameId": 432, "isServerPack": false, "FileNameOnDisk": "rftoolsutility-1.16-3.0.22.jar" }, - "dateInstalled": "2021-01-24T23:41:09.7577715Z", - "dateUpdated": "2021-02-15T21:03:53.4518668Z", - "dateLastUpdateAttempted": "2021-02-15T21:03:53.4518668Z", - "status": 5, + "dateInstalled": "2021-02-25T07:24:21.798177Z", + "dateUpdated": "2021-02-25T07:24:21.798177Z", + "dateLastUpdateAttempted": "0001-01-01T00:00:00", + "status": 3, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -2965,7 +2995,7 @@ "isFuzzyMatch": false, "preferenceReleaseType": null, "manifestName": null, - "installedTargets": null + "installedTargets": [] }, { "addonID": 416294, @@ -5032,86 +5062,6 @@ "manifestName": null, "installedTargets": null }, - { - "addonID": 326950, - "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", - "installedFile": { - "id": 3047440, - "displayName": "1.15.1-1.0.5 (Forge 1.15, 1.16)", - "fileName": "ScreenshotToClipboard-1.15.1-1.0.5.jar", - "fileDate": "2020-09-01T17:45:04.95Z", - "fileLength": 11331, - "releaseType": 1, - "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3047/440/ScreenshotToClipboard-1.15.1-1.0.5.jar", - "isAlternate": false, - "alternateFileId": 0, - "dependencies": [], - "isAvailable": true, - "modules": [ - { - "foldername": "META-INF", - "fingerprint": 780700870, - "type": 0, - "invalidFingerprint": false - }, - { - "foldername": "link", - "fingerprint": 3899155997, - "type": 0, - "invalidFingerprint": false - }, - { - "foldername": "headless.js", - "fingerprint": 18595282, - "type": 0, - "invalidFingerprint": false - }, - { - "foldername": "pack.mcmeta", - "fingerprint": 1945883955, - "type": 0, - "invalidFingerprint": false - } - ], - "packageFingerprint": 789796348, - "gameVersion": [ - "1.16.3", - "1.16.1", - "1.15", - "1.16", - "1.16.5", - "Forge", - "1.15.2", - "1.16.4", - "1.16.2", - "1.15.1" - ], - "hasInstallScript": false, - "isCompatibleWithClient": false, - "categorySectionPackageType": 0, - "restrictProjectFileAccess": 0, - "projectStatus": 0, - "projectId": 0, - "gameVersionDateReleased": "2019-08-01T00:00:00Z", - "gameId": 0, - "isServerPack": false, - "FileNameOnDisk": "ScreenshotToClipboard-1.15.1-1.0.5.jar" - }, - "dateInstalled": "2021-02-07T18:59:07.2755445Z", - "dateUpdated": "2021-02-07T18:59:07.287468Z", - "dateLastUpdateAttempted": "2021-02-07T18:59:07.287468Z", - "status": 5, - "preferenceAutoInstallUpdates": null, - "preferenceAlternateFile": false, - "preferenceIsIgnored": false, - "isModified": false, - "isWorkingCopy": false, - "isFuzzyMatch": false, - "preferenceReleaseType": null, - "manifestName": null, - "installedTargets": null - }, { "addonID": 228525, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", @@ -8402,16 +8352,16 @@ "addonID": 242195, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3198877, - "displayName": "DarkUtilities-1.16.5-8.0.3.jar", - "fileName": "DarkUtilities-1.16.5-8.0.3.jar", - "fileDate": "2021-02-10T05:12:08.123Z", - "fileLength": 240041, - "releaseType": 1, + "id": 3215025, + "displayName": "DarkUtilities-1.16.5-8.0.4.jar", + "fileName": "DarkUtilities-1.16.5-8.0.4.jar", + "fileDate": "2021-02-24T01:33:19.027Z", + "fileLength": 243680, + "releaseType": 3, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3198/877/DarkUtilities-1.16.5-8.0.3.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3215/25/DarkUtilities-1.16.5-8.0.4.jar", "isAlternate": false, - "alternateFileId": 3198878, + "alternateFileId": 3215026, "dependencies": [ { "id": 0, @@ -8430,13 +8380,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 470694015, + "fingerprint": 773692229, "type": 0, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 3670454566, + "fingerprint": 3747696500, "type": 0, "invalidFingerprint": false }, @@ -8459,7 +8409,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 1144350438, + "packageFingerprint": 1847687295, "gameVersion": [ "1.16.5", "Forge" @@ -8473,12 +8423,12 @@ "gameVersionDateReleased": "2008-03-01T06:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "DarkUtilities-1.16.5-8.0.3.jar" + "FileNameOnDisk": "DarkUtilities-1.16.5-8.0.4.jar" }, "dateInstalled": "2021-01-24T23:41:09.6999357Z", - "dateUpdated": "2021-02-10T18:55:40.9056158Z", - "dateLastUpdateAttempted": "2021-02-10T18:55:40.9056158Z", - "status": 5, + "dateUpdated": "2021-02-24T21:23:43.4641676Z", + "dateLastUpdateAttempted": "2021-02-24T21:23:43.4641676Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -8986,7 +8936,7 @@ "dateInstalled": "2021-02-22T20:52:28.1690228Z", "dateUpdated": "2021-02-22T20:52:28.1750233Z", "dateLastUpdateAttempted": "2021-02-22T20:52:28.1750233Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -11735,51 +11685,51 @@ "addonID": 289412, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3213290, - "displayName": "ftb-quests-1605.2.0-build.30-forge.jar", - "fileName": "ftb-quests-1605.2.0-build.30-forge.jar", - "fileDate": "2021-02-22T19:20:42.377Z", - "fileLength": 869437, + "id": 3216005, + "displayName": "ftb-quests-1605.2.0-build.31-forge.jar", + "fileName": "ftb-quests-1605.2.0-build.31-forge.jar", + "fileDate": "2021-02-24T23:04:28.47Z", + "fileLength": 869535, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3213/290/ftb-quests-1605.2.0-build.30-forge.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3216/5/ftb-quests-1605.2.0-build.31-forge.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { "id": 0, - "addonId": 419699, - "type": 3, + "addonId": 238222, + "type": 2, "fileId": 0 }, { "id": 0, - "addonId": 268655, + "addonId": 238086, "type": 2, "fileId": 0 }, { "id": 0, - "addonId": 404465, - "type": 3, + "addonId": 268655, + "type": 2, "fileId": 0 }, { "id": 0, - "addonId": 238086, - "type": 2, + "addonId": 309674, + "type": 3, "fileId": 0 }, { "id": 0, - "addonId": 309674, + "addonId": 419699, "type": 3, "fileId": 0 }, { "id": 0, - "addonId": 238222, - "type": 2, + "addonId": 404465, + "type": 3, "fileId": 0 } ], @@ -11817,13 +11767,13 @@ }, { "foldername": "META-INF", - "fingerprint": 1605561383, + "fingerprint": 3494267452, "type": 0, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 746211977, + "fingerprint": 4134538478, "type": 0, "invalidFingerprint": false }, @@ -11834,7 +11784,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 2249143371, + "packageFingerprint": 2064251060, "gameVersion": [ "1.16.5", "Forge", @@ -11849,11 +11799,11 @@ "gameVersionDateReleased": "2008-03-01T06:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "ftb-quests-1605.2.0-build.30-forge.jar" + "FileNameOnDisk": "ftb-quests-1605.2.0-build.31-forge.jar" }, "dateInstalled": "2021-02-22T21:40:14.8709548Z", - "dateUpdated": "2021-02-22T21:40:14.8849559Z", - "dateLastUpdateAttempted": "2021-02-22T21:40:14.8849559Z", + "dateUpdated": "2021-02-25T06:06:57.1376602Z", + "dateLastUpdateAttempted": "2021-02-25T06:06:57.1376602Z", "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -12611,14 +12561,14 @@ "addonID": 412525, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3201483, - "displayName": "LibX-1.16.3-1.0.15.jar", - "fileName": "LibX-1.16.3-1.0.15.jar", - "fileDate": "2021-02-12T14:16:10.993Z", - "fileLength": 176863, - "releaseType": 3, + "id": 3214414, + "displayName": "LibX-1.16.3-1.0.17.jar", + "fileName": "LibX-1.16.3-1.0.17.jar", + "fileDate": "2021-02-23T16:34:14.883Z", + "fileLength": 176827, + "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3201/483/LibX-1.16.3-1.0.15.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3214/414/LibX-1.16.3-1.0.17.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -12626,19 +12576,19 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 375055348, + "fingerprint": 3648063407, "type": 0, "invalidFingerprint": false }, { "foldername": "io", - "fingerprint": 556389255, + "fingerprint": 2915240567, "type": 0, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 757552317, + "fingerprint": 1350360770, "type": 0, "invalidFingerprint": false }, @@ -12661,7 +12611,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 1084589068, + "packageFingerprint": 852848161, "gameVersion": [ "1.16.3", "1.16.5", @@ -12677,11 +12627,11 @@ "gameVersionDateReleased": "2008-03-01T06:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "LibX-1.16.3-1.0.15.jar" + "FileNameOnDisk": "LibX-1.16.3-1.0.17.jar" }, "dateInstalled": "2021-01-24T23:41:09.6341029Z", - "dateUpdated": "2021-02-12T20:46:34.1926414Z", - "dateLastUpdateAttempted": "2021-02-12T20:46:34.1926414Z", + "dateUpdated": "2021-02-24T07:09:52.7694105Z", + "dateLastUpdateAttempted": "2021-02-24T07:09:52.7694105Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -13842,10 +13792,10 @@ "isServerPack": false, "FileNameOnDisk": "rftoolsbuilder-1.16-3.0.13.jar" }, - "dateInstalled": "2021-01-24T23:41:09.7777173Z", - "dateUpdated": "2021-01-24T23:41:09.7777173Z", + "dateInstalled": "2021-02-25T07:24:21.8001781Z", + "dateUpdated": "2021-02-25T07:24:21.8001781Z", "dateLastUpdateAttempted": "0001-01-01T00:00:00", - "status": 5, + "status": 3, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -13854,7 +13804,7 @@ "isFuzzyMatch": false, "preferenceReleaseType": null, "manifestName": null, - "installedTargets": null + "installedTargets": [] }, { "addonID": 291788, @@ -15127,6 +15077,86 @@ "manifestName": null, "installedTargets": null }, + { + "addonID": 74924, + "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", + "installedFile": { + "id": 3180804, + "displayName": "Mantle 1.6.79 for 1.16.5", + "fileName": "Mantle-1.16.5-1.6.79.jar", + "fileDate": "2021-01-25T14:34:58.063Z", + "fileLength": 581249, + "releaseType": 2, + "fileStatus": 4, + "downloadUrl": "https://edge.forgecdn.net/files/3180/804/Mantle-1.16.5-1.6.79.jar", + "isAlternate": false, + "alternateFileId": 0, + "dependencies": [], + "isAvailable": true, + "modules": [ + { + "foldername": "META-INF", + "fingerprint": 1363920683, + "type": 0, + "invalidFingerprint": false + }, + { + "foldername": "slimeknights", + "fingerprint": 2555928036, + "type": 0, + "invalidFingerprint": false + }, + { + "foldername": "pack.mcmeta", + "fingerprint": 3720854501, + "type": 0, + "invalidFingerprint": false + }, + { + "foldername": "Mantle.png", + "fingerprint": 3296224890, + "type": 0, + "invalidFingerprint": false + }, + { + "foldername": "assets", + "fingerprint": 3843535911, + "type": 0, + "invalidFingerprint": false + } + ], + "packageFingerprint": 2803017213, + "gameVersion": [ + "1.16.3", + "1.16.5", + "1.16.4", + "1.16.2" + ], + "hasInstallScript": false, + "isCompatibleWithClient": false, + "categorySectionPackageType": 0, + "restrictProjectFileAccess": 0, + "projectStatus": 0, + "projectId": 0, + "gameVersionDateReleased": "2008-03-01T06:00:00Z", + "gameId": 0, + "isServerPack": false, + "FileNameOnDisk": "Mantle-1.16.5-1.6.79.jar" + }, + "dateInstalled": "2021-02-24T19:08:56.2176223Z", + "dateUpdated": "2021-02-24T19:08:56.2285846Z", + "dateLastUpdateAttempted": "2021-02-24T19:08:56.2285846Z", + "status": 4, + "preferenceAutoInstallUpdates": null, + "preferenceAlternateFile": false, + "preferenceIsIgnored": false, + "isModified": false, + "isWorkingCopy": false, + "isFuzzyMatch": false, + "preferenceReleaseType": null, + "manifestName": null, + "installedTargets": null + }, { "addonID": 361276, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", @@ -16024,7 +16054,7 @@ "dateInstalled": "2021-01-24T23:41:09.6789821Z", "dateUpdated": "2021-02-22T18:07:10.5794165Z", "dateLastUpdateAttempted": "2021-02-22T18:07:10.5794165Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -17778,7 +17808,7 @@ "dateInstalled": "2021-02-22T18:09:56.0613625Z", "dateUpdated": "2021-02-22T21:43:28.1789995Z", "dateLastUpdateAttempted": "2021-02-22T21:43:28.1789995Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -17886,140 +17916,18 @@ "manifestName": null, "installedTargets": null }, - { - "addonID": 245211, - "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", - "installedFile": { - "id": 3157997, - "displayName": "TheOneProbe - 1.16-3.0.7", - "fileName": "theoneprobe-1.16-3.0.7.jar", - "fileDate": "2021-01-04T07:28:14.593Z", - "fileLength": 307065, - "releaseType": 1, - "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3157/997/theoneprobe-1.16-3.0.7.jar", - "isAlternate": false, - "alternateFileId": 0, - "dependencies": [ - { - "id": 53569670, - "addonId": 227083, - "type": 2, - "fileId": 3157997 - }, - { - "id": 53569672, - "addonId": 244651, - "type": 2, - "fileId": 3157997 - }, - { - "id": 53569671, - "addonId": 270789, - "type": 2, - "fileId": 3157997 - } - ], - "isAvailable": true, - "modules": [ - { - "foldername": "META-INF", - "fingerprint": 2279319940, - "type": 3, - "invalidFingerprint": false - }, - { - "foldername": "mcjty", - "fingerprint": 3108423740, - "type": 3, - "invalidFingerprint": false - }, - { - "foldername": "assets", - "fingerprint": 3749773231, - "type": 3, - "invalidFingerprint": false - }, - { - "foldername": "pack.mcmeta", - "fingerprint": 3099463473, - "type": 3, - "invalidFingerprint": false - }, - { - "foldername": "data", - "fingerprint": 2393313921, - "type": 3, - "invalidFingerprint": false - } - ], - "packageFingerprint": 1240636736, - "gameVersion": [ - "1.16.3", - "Forge", - "1.16.4" - ], - "sortableGameVersion": [ - { - "gameVersionPadded": "0000000001.0000000016.0000000003", - "gameVersion": "1.16.3", - "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z", - "gameVersionName": "1.16.3" - }, - { - "gameVersionPadded": "0", - "gameVersion": "", - "gameVersionReleaseDate": "2019-08-01T00:00:00Z", - "gameVersionName": "Forge" - }, - { - "gameVersionPadded": "0000000001.0000000016.0000000004", - "gameVersion": "1.16.4", - "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", - "gameVersionName": "1.16.4" - } - ], - "hasInstallScript": false, - "isCompatibleWithClient": false, - "categorySectionPackageType": 6, - "restrictProjectFileAccess": 1, - "projectStatus": 4, - "renderCacheId": 2113035, - "projectId": 245211, - "packageFingerprintId": 579834078, - "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 2625442, - "gameVersionId": 4458, - "gameId": 432, - "isServerPack": false, - "FileNameOnDisk": "theoneprobe-1.16-3.0.7.jar" - }, - "dateInstalled": "2021-01-24T23:41:09.6660164Z", - "dateUpdated": "2021-01-24T23:41:09.6660164Z", - "dateLastUpdateAttempted": "0001-01-01T00:00:00", - "status": 5, - "preferenceAutoInstallUpdates": null, - "preferenceAlternateFile": false, - "preferenceIsIgnored": false, - "isModified": false, - "isWorkingCopy": false, - "isFuzzyMatch": false, - "preferenceReleaseType": null, - "manifestName": null, - "installedTargets": null - }, { "addonID": 419699, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3208686, - "displayName": "[Forge 1.16.4/5] v1.7.117", - "fileName": "architectury-1.7.117-forge.jar", - "fileDate": "2021-02-18T18:25:47.65Z", - "fileLength": 293158, + "id": 3216365, + "displayName": "[Forge 1.16.4/5] v1.8.121", + "fileName": "architectury-1.8.121-forge.jar", + "fileDate": "2021-02-25T07:05:59.263Z", + "fileLength": 301666, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3208/686/architectury-1.7.117-forge.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3216/365/architectury-1.8.121-forge.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -18027,7 +17935,7 @@ "modules": [ { "foldername": "architectury-common.mixins.json", - "fingerprint": 1997114705, + "fingerprint": 4139065438, "type": 0, "invalidFingerprint": false }, @@ -18039,13 +17947,13 @@ }, { "foldername": "architectury-common-refmap.json", - "fingerprint": 3237441683, + "fingerprint": 2591852291, "type": 0, "invalidFingerprint": false }, { "foldername": "architectury.mixins.json", - "fingerprint": 325793104, + "fingerprint": 3882299233, "type": 0, "invalidFingerprint": false }, @@ -18057,30 +17965,30 @@ }, { "foldername": "META-INF", - "fingerprint": 1512956905, + "fingerprint": 3082881993, "type": 0, "invalidFingerprint": false }, { "foldername": "me", - "fingerprint": 2812307175, + "fingerprint": 1004427649, "type": 0, "invalidFingerprint": false }, { - "foldername": "architectury_inject_architectury_common_68e56559c5bf4ce59aac156574c716e1", - "fingerprint": 3783897306, + "foldername": "architectury_inject_architectury_common_aac7f9421eeb4ac88fddbe860828042b", + "fingerprint": 1458284797, "type": 0, "invalidFingerprint": false }, { "foldername": "architectury-forge-refmap.json", - "fingerprint": 1098679713, + "fingerprint": 3486102691, "type": 0, "invalidFingerprint": false } ], - "packageFingerprint": 3370297389, + "packageFingerprint": 1291383060, "gameVersion": [ "1.16.5", "Forge", @@ -18095,12 +18003,12 @@ "gameVersionDateReleased": "2008-03-01T06:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "architectury-1.7.117-forge.jar" + "FileNameOnDisk": "architectury-1.8.121-forge.jar" }, "dateInstalled": "2021-02-15T21:03:42.3542083Z", - "dateUpdated": "2021-02-19T19:08:14.6324706Z", - "dateLastUpdateAttempted": "2021-02-19T19:08:14.6324706Z", - "status": 5, + "dateUpdated": "2021-02-25T07:21:10.9477509Z", + "dateLastUpdateAttempted": "2021-02-25T07:21:10.9477509Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -18408,14 +18316,14 @@ "addonID": 312353, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3208854, - "displayName": "Artifacts-1.16.5-2.8.1.jar", - "fileName": "Artifacts-1.16.5-2.8.1.jar", - "fileDate": "2021-02-18T21:15:59.803Z", - "fileLength": 357630, + "id": 3214070, + "displayName": "Artifacts-1.16.5-2.8.2.jar", + "fileName": "Artifacts-1.16.5-2.8.2.jar", + "fileDate": "2021-02-23T11:20:06.837Z", + "fileLength": 354846, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3208/854/Artifacts-1.16.5-2.8.1.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3214/70/Artifacts-1.16.5-2.8.2.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ @@ -18430,25 +18338,25 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 1644448584, + "fingerprint": 2732853133, "type": 0, "invalidFingerprint": false }, { "foldername": "artifacts", - "fingerprint": 2020472525, + "fingerprint": 1791576354, "type": 0, "invalidFingerprint": false }, { "foldername": ".cache", - "fingerprint": 1374862253, + "fingerprint": 1972793852, "type": 0, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 3451164704, + "fingerprint": 2175578143, "type": 0, "invalidFingerprint": false }, @@ -18471,7 +18379,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 2633225608, + "packageFingerprint": 3053854556, "gameVersion": [ "1.16.3", "1.16.5", @@ -18487,11 +18395,11 @@ "gameVersionDateReleased": "2019-08-01T00:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "Artifacts-1.16.5-2.8.1.jar" + "FileNameOnDisk": "Artifacts-1.16.5-2.8.2.jar" }, "dateInstalled": "2021-01-24T23:41:09.7866934Z", - "dateUpdated": "2021-02-19T19:08:12.3669376Z", - "dateLastUpdateAttempted": "2021-02-19T19:08:12.3669376Z", + "dateUpdated": "2021-02-24T07:09:45.521453Z", + "dateLastUpdateAttempted": "2021-02-24T07:09:45.521453Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -19487,14 +19395,14 @@ "addonID": 363820, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3195631, - "displayName": "0.2.5", - "fileName": "TerraForged-1.16.4-0.2.5.jar", - "fileDate": "2021-02-07T11:53:18.767Z", - "fileLength": 1638662, + "id": 3215379, + "displayName": "0.2.8b", + "fileName": "TerraForged-1.16.4-0.2.8.jar", + "fileDate": "2021-02-24T13:07:19.15Z", + "fileLength": 1666335, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3195/631/TerraForged-1.16.4-0.2.5.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3215/379/TerraForged-1.16.4-0.2.8.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -19502,19 +19410,19 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 3128553639, + "fingerprint": 4211721157, "type": 0, "invalidFingerprint": false }, { "foldername": "LICENSE", - "fingerprint": 2404327566, + "fingerprint": 190072836, "type": 0, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 417130927, + "fingerprint": 3836799468, "type": 0, "invalidFingerprint": false }, @@ -19532,13 +19440,13 @@ }, { "foldername": "com", - "fingerprint": 652451943, + "fingerprint": 1866728684, "type": 0, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 4195250060, + "fingerprint": 1754147670, "type": 0, "invalidFingerprint": false }, @@ -19573,7 +19481,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 1087267244, + "packageFingerprint": 1539877218, "gameVersion": [ "1.16.5", "Forge", @@ -19588,21 +19496,21 @@ "gameVersionDateReleased": "2008-03-01T06:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "TerraForged-1.16.4-0.2.5.jar" + "FileNameOnDisk": "TerraForged-1.16.4-0.2.8.jar" }, "dateInstalled": "2021-02-23T16:23:57.8317268Z", - "dateUpdated": "2021-02-23T16:23:57.8447261Z", - "dateLastUpdateAttempted": "2021-02-23T16:23:57.8447261Z", - "status": 3, + "dateUpdated": "2021-02-24T21:23:54.9929698Z", + "dateLastUpdateAttempted": "2021-02-24T21:23:54.9929698Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, - "isModified": true, + "isModified": false, "isWorkingCopy": false, "isFuzzyMatch": false, "preferenceReleaseType": null, "manifestName": null, - "installedTargets": [] + "installedTargets": null }, { "addonID": 247496, @@ -20106,7 +20014,7 @@ "dateInstalled": "2021-01-24T23:41:09.6839687Z", "dateUpdated": "2021-02-22T18:07:10.1085193Z", "dateLastUpdateAttempted": "2021-02-22T18:07:10.1085193Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -21390,14 +21298,14 @@ "addonID": 243121, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3212156, - "displayName": "Quark-r2.4-306.jar", - "fileName": "Quark-r2.4-306.jar", - "fileDate": "2021-02-21T21:34:09.5Z", - "fileLength": 6286626, + "id": 3216263, + "displayName": "Quark-r2.4-307.jar", + "fileName": "Quark-r2.4-307.jar", + "fileDate": "2021-02-25T03:54:29.667Z", + "fileLength": 6287142, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3212/156/Quark-r2.4-306.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3216/263/Quark-r2.4-307.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ @@ -21412,13 +21320,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 2732410421, + "fingerprint": 1699375313, "type": 0, "invalidFingerprint": false }, { "foldername": "vazkii", - "fingerprint": 3052657227, + "fingerprint": 198807897, "type": 0, "invalidFingerprint": false }, @@ -21465,7 +21373,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 283060508, + "packageFingerprint": 80091109, "gameVersion": [ "1.16.5", "Forge" @@ -21479,12 +21387,12 @@ "gameVersionDateReleased": "2008-03-01T06:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "Quark-r2.4-306.jar" + "FileNameOnDisk": "Quark-r2.4-307.jar" }, "dateInstalled": "2021-02-12T20:47:22.2688873Z", - "dateUpdated": "2021-02-22T06:50:04.8444863Z", - "dateLastUpdateAttempted": "2021-02-22T06:50:04.8444863Z", - "status": 5, + "dateUpdated": "2021-02-25T06:06:59.4202741Z", + "dateLastUpdateAttempted": "2021-02-25T06:06:59.4202741Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -21576,7 +21484,7 @@ "dateInstalled": "2021-02-09T19:42:41.0285551Z", "dateUpdated": "2021-02-23T16:25:09.7181458Z", "dateLastUpdateAttempted": "2021-02-23T16:25:09.7181458Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -22527,14 +22435,14 @@ "addonID": 413234, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3150292, - "displayName": "TravelAnchors-2.2.jar", - "fileName": "TravelAnchors-2.2.jar", - "fileDate": "2020-12-27T13:23:17.37Z", - "fileLength": 64029, + "id": 3215753, + "displayName": "TravelAnchors-2.3.jar", + "fileName": "TravelAnchors-2.3.jar", + "fileDate": "2021-02-24T18:40:43.1Z", + "fileLength": 64767, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3150/292/TravelAnchors-2.2.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3215/753/TravelAnchors-2.3.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ @@ -22549,13 +22457,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 2062733526, + "fingerprint": 917522988, "type": 0, "invalidFingerprint": false }, { "foldername": "de", - "fingerprint": 704084389, + "fingerprint": 2853065360, "type": 0, "invalidFingerprint": false }, @@ -22573,12 +22481,12 @@ }, { "foldername": "assets", - "fingerprint": 1958205664, + "fingerprint": 3476242192, "type": 0, "invalidFingerprint": false } ], - "packageFingerprint": 1270540491, + "packageFingerprint": 4276454748, "gameVersion": [ "1.16.3", "1.16.5", @@ -22594,12 +22502,12 @@ "gameVersionDateReleased": "2008-03-01T06:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "TravelAnchors-2.2.jar" + "FileNameOnDisk": "TravelAnchors-2.3.jar" }, "dateInstalled": "2021-01-24T23:41:09.6491074Z", - "dateUpdated": "2021-01-31T19:53:04.966859Z", - "dateLastUpdateAttempted": "2021-01-31T19:53:04.966859Z", - "status": 5, + "dateUpdated": "2021-02-24T21:23:54.7656034Z", + "dateLastUpdateAttempted": "2021-02-24T21:23:54.7656034Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -23739,14 +23647,14 @@ "addonID": 422301, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3208899, - "displayName": "sophisticatedbackpacks-1.16.4-2.2.0.171.jar", - "fileName": "sophisticatedbackpacks-1.16.4-2.2.0.171.jar", - "fileDate": "2021-02-18T22:00:56.887Z", - "fileLength": 672509, + "id": 3215196, + "displayName": "sophisticatedbackpacks-1.16.4-2.2.1.178.jar", + "fileName": "sophisticatedbackpacks-1.16.4-2.2.1.178.jar", + "fileDate": "2021-02-24T07:27:29.957Z", + "fileLength": 705121, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3208/899/sophisticatedbackpacks-1.16.4-2.2.0.171.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3215/196/sophisticatedbackpacks-1.16.4-2.2.1.178.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ @@ -23767,13 +23675,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 2999253883, + "fingerprint": 558786155, "type": 0, "invalidFingerprint": false }, { "foldername": "net", - "fingerprint": 1945351655, + "fingerprint": 852426880, "type": 0, "invalidFingerprint": false }, @@ -23785,13 +23693,13 @@ }, { "foldername": "assets", - "fingerprint": 2004784746, + "fingerprint": 2724936233, "type": 0, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 1533517241, + "fingerprint": 2220313804, "type": 0, "invalidFingerprint": false }, @@ -23802,7 +23710,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 4006081041, + "packageFingerprint": 966894603, "gameVersion": [ "1.16.5", "1.16.4" @@ -23816,12 +23724,12 @@ "gameVersionDateReleased": "2020-11-02T18:40:51.49Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "sophisticatedbackpacks-1.16.4-2.2.0.171.jar" + "FileNameOnDisk": "sophisticatedbackpacks-1.16.4-2.2.1.178.jar" }, "dateInstalled": "2021-01-24T23:41:09.7837017Z", - "dateUpdated": "2021-02-19T19:08:19.1659714Z", - "dateLastUpdateAttempted": "2021-02-19T19:08:19.1659714Z", - "status": 5, + "dateUpdated": "2021-02-24T21:23:52.0983433Z", + "dateLastUpdateAttempted": "2021-02-24T21:23:52.0983433Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -24898,14 +24806,14 @@ "addonID": 404465, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3194623, - "displayName": "ftb-gui-library-1605.2.1.39-forge.jar", - "fileName": "ftb-gui-library-1605.2.1.39-forge.jar", - "fileDate": "2021-02-06T13:02:43.897Z", - "fileLength": 432129, + "id": 3214262, + "displayName": "ftb-gui-library-1605.2.1.40-forge.jar", + "fileName": "ftb-gui-library-1605.2.1.40-forge.jar", + "fileDate": "2021-02-23T14:44:30.037Z", + "fileLength": 432190, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3194/623/ftb-gui-library-1605.2.1.39-forge.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3214/262/ftb-gui-library-1605.2.1.40-forge.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ @@ -24938,13 +24846,13 @@ }, { "foldername": "META-INF", - "fingerprint": 740307852, + "fingerprint": 692368130, "type": 0, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 369214823, + "fingerprint": 1823192663, "type": 0, "invalidFingerprint": false }, @@ -24955,7 +24863,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 1591894318, + "packageFingerprint": 1045785294, "gameVersion": [ "1.16.3", "1.16.5", @@ -24972,11 +24880,11 @@ "gameVersionDateReleased": "2008-03-01T06:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "ftb-gui-library-1605.2.1.39-forge.jar" + "FileNameOnDisk": "ftb-gui-library-1605.2.1.40-forge.jar" }, "dateInstalled": "2021-01-24T23:41:09.613158Z", - "dateUpdated": "2021-02-07T19:10:49.8464874Z", - "dateLastUpdateAttempted": "2021-02-07T19:10:49.8464874Z", + "dateUpdated": "2021-02-24T07:09:53.0842169Z", + "dateLastUpdateAttempted": "2021-02-24T07:09:53.0842169Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -26340,14 +26248,14 @@ "addonID": 429235, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3165037, - "displayName": "ferritecore-1.1.1.jar", - "fileName": "ferritecore-1.1.1.jar", - "fileDate": "2021-01-11T10:25:13.327Z", - "fileLength": 51740, + "id": 3215757, + "displayName": "ferritecore-2.0.1-forge.jar", + "fileName": "ferritecore-2.0.1-forge.jar", + "fileDate": "2021-02-24T18:45:48.133Z", + "fileLength": 87612, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3165/37/ferritecore-1.1.1.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3215/757/ferritecore-2.0.1-forge.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -26355,110 +26263,91 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 2543352067, - "type": 3, + "fingerprint": 2421296927, + "type": 0, "invalidFingerprint": false }, { - "foldername": "asm", - "fingerprint": 3343533484, - "type": 3, + "foldername": "ferritecore.mrl.mixin.json", + "fingerprint": 1186793239, + "type": 0, "invalidFingerprint": false }, { - "foldername": "ferritecore.dedupmultipart.mixin.json", - "fingerprint": 1468925435, - "type": 3, + "foldername": "ferritecore.dedupbakedquad.mixin.json", + "fingerprint": 1286500205, + "type": 0, "invalidFingerprint": false }, { - "foldername": "ferritecore.fastmap.mixin.json", - "fingerprint": 3944882132, - "type": 3, + "foldername": "ferritecore.blockstatecache.mixin.json", + "fingerprint": 1020338111, + "type": 0, "invalidFingerprint": false }, { - "foldername": "ferritecore.mrl.mixin.json", - "fingerprint": 2988667889, - "type": 3, + "foldername": "ferritecore.fastmap.mixin.json", + "fingerprint": 1274405922, + "type": 0, "invalidFingerprint": false }, { - "foldername": "ferritecore.nopropertymap.mixin.json", - "fingerprint": 929196847, - "type": 3, + "foldername": "ferritecore.dedupmultipart.mixin.json", + "fingerprint": 179854321, + "type": 0, "invalidFingerprint": false }, { "foldername": "ferritecore.predicates.mixin.json", - "fingerprint": 3460375502, - "type": 3, + "fingerprint": 1322969185, + "type": 0, "invalidFingerprint": false }, { - "foldername": "ferritecore.refmap.json", - "fingerprint": 2330557100, - "type": 3, + "foldername": "ferritecore-common-refmap.json", + "fingerprint": 4073161422, + "type": 0, + "invalidFingerprint": false + }, + { + "foldername": "pack.mcmeta", + "fingerprint": 2809587253, + "type": 0, "invalidFingerprint": false }, { "foldername": "malte0811", - "fingerprint": 3866203887, - "type": 3, + "fingerprint": 1607865497, + "type": 0, "invalidFingerprint": false }, { - "foldername": "pack.mcmeta", - "fingerprint": 2809587253, - "type": 3, + "foldername": "com", + "fingerprint": 4167066885, + "type": 0, "invalidFingerprint": false } ], - "packageFingerprint": 1344427401, + "packageFingerprint": 280332066, "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" - }, - { - "gameVersionPadded": "0", - "gameVersion": "", - "gameVersionReleaseDate": "2019-08-01T00:00:00Z", - "gameVersionName": "Forge" - }, - { - "gameVersionPadded": "0000000001.0000000016.0000000004", - "gameVersion": "1.16.4", - "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", - "gameVersionName": "1.16.4" - } + "Forge" ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 6, - "restrictProjectFileAccess": 1, - "projectStatus": 4, - "renderCacheId": 2122054, - "projectId": 429235, - "packageFingerprintId": 584047362, + "categorySectionPackageType": 0, + "restrictProjectFileAccess": 0, + "projectStatus": 0, + "projectId": 0, "gameVersionDateReleased": "2019-08-01T00:00:00Z", - "gameVersionMappingId": 2638629, - "gameVersionId": 7498, - "gameId": 432, + "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "ferritecore-1.1.1.jar" + "FileNameOnDisk": "ferritecore-2.0.1-forge.jar" }, - "dateInstalled": "2021-01-24T23:41:09.754779Z", - "dateUpdated": "2021-01-24T23:41:09.754779Z", - "dateLastUpdateAttempted": "0001-01-01T00:00:00", - "status": 5, + "dateInstalled": "2021-02-25T06:07:20.3318739Z", + "dateUpdated": "2021-02-25T06:07:20.3578675Z", + "dateLastUpdateAttempted": "2021-02-25T06:07:20.3578675Z", + "status": 3, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -26863,14 +26752,14 @@ "addonID": 69118, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3114135, - "displayName": "Morpheus-1.16.4-4.2.68.jar", - "fileName": "Morpheus-1.16.4-4.2.68.jar", - "fileDate": "2020-11-17T14:54:38.11Z", - "fileLength": 24481, + "id": 3215383, + "displayName": "Morpheus-1.16.5-4.2.70.jar", + "fileName": "Morpheus-1.16.5-4.2.70.jar", + "fileDate": "2021-02-24T13:10:43.58Z", + "fileLength": 24390, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3114/135/Morpheus-1.16.4-4.2.68.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3215/383/Morpheus-1.16.5-4.2.70.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -26878,67 +26767,49 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 375271774, - "type": 3, + "fingerprint": 1113630749, + "type": 0, "invalidFingerprint": false }, { "foldername": "net", - "fingerprint": 1617606703, - "type": 3, + "fingerprint": 1565500129, + "type": 0, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 407958785, - "type": 3, + "type": 0, "invalidFingerprint": false }, { "foldername": "mcmod.info", "fingerprint": 462080067, - "type": 3, + "type": 0, "invalidFingerprint": false } ], - "packageFingerprint": 1154644746, + "packageFingerprint": 2731782916, "gameVersion": [ - "Forge", - "1.16.4" - ], - "sortableGameVersion": [ - { - "gameVersionPadded": "0", - "gameVersion": "", - "gameVersionReleaseDate": "2019-08-01T00:00:00Z", - "gameVersionName": "Forge" - }, - { - "gameVersionPadded": "0000000001.0000000016.0000000004", - "gameVersion": "1.16.4", - "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", - "gameVersionName": "1.16.4" - } + "1.16.5", + "Forge" ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 6, - "restrictProjectFileAccess": 1, - "projectStatus": 4, - "renderCacheId": 2057216, - "projectId": 69118, - "packageFingerprintId": 555130107, + "categorySectionPackageType": 0, + "restrictProjectFileAccess": 0, + "projectStatus": 0, + "projectId": 0, "gameVersionDateReleased": "2008-03-01T06:00:00Z", - "gameVersionMappingId": 2540221, - "gameVersionId": 4458, - "gameId": 432, + "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "Morpheus-1.16.4-4.2.68.jar" + "FileNameOnDisk": "Morpheus-1.16.5-4.2.70.jar" }, "dateInstalled": "2021-01-24T23:41:09.6739949Z", - "dateUpdated": "2021-01-24T23:41:09.6739949Z", - "dateLastUpdateAttempted": "0001-01-01T00:00:00", - "status": 5, + "dateUpdated": "2021-02-24T21:23:48.3788639Z", + "dateLastUpdateAttempted": "2021-02-24T21:23:48.3788639Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -28488,14 +28359,14 @@ "addonID": 281849, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3194882, - "displayName": "pneumaticcraft-repressurized-1.16.5-2.10.0-134.jar", - "fileName": "pneumaticcraft-repressurized-1.16.5-2.10.0-134.jar", - "fileDate": "2021-02-06T17:59:05.833Z", - "fileLength": 7067249, - "releaseType": 2, + "id": 3214375, + "displayName": "pneumaticcraft-repressurized-1.16.5-2.10.1-140.jar", + "fileName": "pneumaticcraft-repressurized-1.16.5-2.10.1-140.jar", + "fileDate": "2021-02-23T16:02:19.023Z", + "fileLength": 7084656, + "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3194/882/pneumaticcraft-repressurized-1.16.5-2.10.0-134.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3214/375/pneumaticcraft-repressurized-1.16.5-2.10.1-140.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ @@ -28510,19 +28381,19 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 647204834, + "fingerprint": 4162841098, "type": 0, "invalidFingerprint": false }, { "foldername": "me", - "fingerprint": 1360460297, + "fingerprint": 1548002735, "type": 0, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 948366529, + "fingerprint": 1321961339, "type": 0, "invalidFingerprint": false }, @@ -28534,12 +28405,12 @@ }, { "foldername": "assets", - "fingerprint": 1213519030, + "fingerprint": 1751378051, "type": 0, "invalidFingerprint": false } ], - "packageFingerprint": 3971508593, + "packageFingerprint": 3607662168, "gameVersion": [ "1.16.3", "1.16.5", @@ -28555,11 +28426,11 @@ "gameVersionDateReleased": "2019-08-01T00:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "pneumaticcraft-repressurized-1.16.5-2.10.0-134.jar" + "FileNameOnDisk": "pneumaticcraft-repressurized-1.16.5-2.10.1-140.jar" }, "dateInstalled": "2021-01-24T23:41:09.6909503Z", - "dateUpdated": "2021-02-07T19:10:46.9222499Z", - "dateLastUpdateAttempted": "2021-02-07T19:10:46.9222499Z", + "dateUpdated": "2021-02-24T07:09:51.1900407Z", + "dateLastUpdateAttempted": "2021-02-24T07:09:51.1900407Z", "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, From bb136a08e9dadc7f6616e4ef9b8ade9c88cebd4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 13:18:42 +0100 Subject: [PATCH 19/35] mek lithium quest #1139 --- config/ftbquests/quests/chapters/mekanism.snbt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/mekanism.snbt b/config/ftbquests/quests/chapters/mekanism.snbt index 4595ffffaa..001785e5d3 100644 --- a/config/ftbquests/quests/chapters/mekanism.snbt +++ b/config/ftbquests/quests/chapters/mekanism.snbt @@ -824,6 +824,8 @@ description: [ "Before moving on, that Brine will need to be run through a second Evaporation Tower to form Liquid Lithium. ", "", + "Next step is to turn the liquid Lithium into Lithium gas using the Rotary Condensentrator.", + "", "This may then be processed in a Chemical Crystallizer to produce a solid form of the element." ], dependencies: ["00000000000006C7"], @@ -835,7 +837,12 @@ item: "mekanism:chemical_crystallizer" }, { - id: "000000000000070B", + id: "0A65673DD920A57E", + type: "item", + item: "mekanism:rotary_condensentrator" + }, + { + id: "65ABA5E4FB3C53C2", type: "item", item: "emendatusenigmatica:lithium_dust" } From e72688901b4d796c82bd729ef0ae0e6bb8ca43a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 13:37:48 +0100 Subject: [PATCH 20/35] hidden a few dusts --- kubejs/client_scripts/constants.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kubejs/client_scripts/constants.js b/kubejs/client_scripts/constants.js index 156d7cb632..f1e9a8ec50 100644 --- a/kubejs/client_scripts/constants.js +++ b/kubejs/client_scripts/constants.js @@ -249,6 +249,10 @@ const disabledItems = [ 'mapperbase:steel_leggings', 'mapperbase:steel_boots', + 'mekanism:sawdust', + 'mekanism:dust_lapis_lazuli', + 'mekanism:dust_lithium', + 'mythicbotany:raindeletia', 'mythicbotany:raindeletia_floating', 'mythicbotany:wither_aconite', From a2eafb8aadbeca8842b94be61d03aa8f5bd31ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 20:53:48 +0100 Subject: [PATCH 21/35] Update minecraftinstance.json --- minecraftinstance.json | 330 +++++++++++++++++++++++++---------------- 1 file changed, 199 insertions(+), 131 deletions(-) diff --git a/minecraftinstance.json b/minecraftinstance.json index 5aab88c937..d3602d213f 100644 --- a/minecraftinstance.json +++ b/minecraftinstance.json @@ -30,7 +30,7 @@ "isUnlocked": true, "javaArgsOverride": null, "javaDirOverride": null, - "lastPlayed": "2021-02-25T07:24:22.8641762Z", + "lastPlayed": "2021-02-25T19:53:38.0009897Z", "manifest": null, "fileDate": "0001-01-01T00:00:00", "installedModpack": null, @@ -46,7 +46,7 @@ "name": "Enigmatica6", "cachedScans": [], "isValid": true, - "lastPreviousMatchUpdate": "2021-02-25T07:24:20.0885987Z", + "lastPreviousMatchUpdate": "2021-02-25T12:25:45.0146117Z", "isEnabled": true, "isPinned": false, "gameVersion": "1.16.5", @@ -73,14 +73,14 @@ "addonID": 409371, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3193977, - "displayName": "meetyourfight-1.16.5-1.1.1.jar", - "fileName": "meetyourfight-1.16.5-1.1.1.jar", - "fileDate": "2021-02-05T20:16:29.25Z", - "fileLength": 155367, + "id": 3217067, + "displayName": "meetyourfight-1.16.5-1.1.2.jar", + "fileName": "meetyourfight-1.16.5-1.1.2.jar", + "fileDate": "2021-02-25T19:39:06.987Z", + "fileLength": 155486, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3193/977/meetyourfight-1.16.5-1.1.1.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3217/67/meetyourfight-1.16.5-1.1.2.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ @@ -101,13 +101,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 1117327065, + "fingerprint": 497403191, "type": 0, "invalidFingerprint": false }, { "foldername": "lykrast", - "fingerprint": 2569340903, + "fingerprint": 1826879218, "type": 0, "invalidFingerprint": false }, @@ -130,7 +130,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 3988320533, + "packageFingerprint": 2079575776, "gameVersion": [ "1.16.3", "1.16.5", @@ -146,12 +146,12 @@ "gameVersionDateReleased": "2019-08-01T00:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "meetyourfight-1.16.5-1.1.1.jar" + "FileNameOnDisk": "meetyourfight-1.16.5-1.1.2.jar" }, "dateInstalled": "2021-01-24T23:41:09.6091684Z", - "dateUpdated": "2021-02-05T22:05:18.7621213Z", - "dateLastUpdateAttempted": "2021-02-05T22:05:18.7621213Z", - "status": 5, + "dateUpdated": "2021-02-25T19:53:24.7896909Z", + "dateLastUpdateAttempted": "2021-02-25T19:53:24.7896909Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -2612,14 +2612,14 @@ "addonID": 405077, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3185670, - "displayName": "gunswithoutroses-1.16.5-1.0.7.jar", - "fileName": "gunswithoutroses-1.16.5-1.0.7.jar", - "fileDate": "2021-01-29T14:03:21.637Z", - "fileLength": 118834, + "id": 3216676, + "displayName": "gunswithoutroses-1.16.5-1.0.8.jar", + "fileName": "gunswithoutroses-1.16.5-1.0.8.jar", + "fileDate": "2021-02-25T14:30:19.387Z", + "fileLength": 118960, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3185/670/gunswithoutroses-1.16.5-1.0.7.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3216/676/gunswithoutroses-1.16.5-1.0.8.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -2627,13 +2627,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 3741666416, + "fingerprint": 3952179549, "type": 0, "invalidFingerprint": false }, { "foldername": "lykrast", - "fingerprint": 2734096518, + "fingerprint": 4245540963, "type": 0, "invalidFingerprint": false }, @@ -2656,7 +2656,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 108221205, + "packageFingerprint": 1730119504, "gameVersion": [ "1.16.3", "1.16.5", @@ -2672,12 +2672,12 @@ "gameVersionDateReleased": "2019-08-01T00:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "gunswithoutroses-1.16.5-1.0.7.jar" + "FileNameOnDisk": "gunswithoutroses-1.16.5-1.0.8.jar" }, "dateInstalled": "2021-01-24T23:41:09.711894Z", - "dateUpdated": "2021-01-30T18:41:28.2409672Z", - "dateLastUpdateAttempted": "2021-01-30T18:41:28.2409672Z", - "status": 5, + "dateUpdated": "2021-02-25T19:53:25.6719326Z", + "dateLastUpdateAttempted": "2021-02-25T19:53:25.6719326Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -2995,7 +2995,7 @@ "isFuzzyMatch": false, "preferenceReleaseType": null, "manifestName": null, - "installedTargets": [] + "installedTargets": null }, { "addonID": 416294, @@ -13804,7 +13804,7 @@ "isFuzzyMatch": false, "preferenceReleaseType": null, "manifestName": null, - "installedTargets": [] + "installedTargets": null }, { "addonID": 291788, @@ -15146,7 +15146,7 @@ "dateInstalled": "2021-02-24T19:08:56.2176223Z", "dateUpdated": "2021-02-24T19:08:56.2285846Z", "dateLastUpdateAttempted": "2021-02-24T19:08:56.2285846Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -17719,26 +17719,26 @@ "addonID": 386134, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3213282, - "displayName": "ftb-ultimine-1605.2.0-build.21-forge.jar", - "fileName": "ftb-ultimine-1605.2.0-build.21-forge.jar", - "fileDate": "2021-02-22T19:15:35.153Z", - "fileLength": 62130, + "id": 3216601, + "displayName": "ftb-ultimine-1605.2.0-build.22-forge.jar", + "fileName": "ftb-ultimine-1605.2.0-build.22-forge.jar", + "fileDate": "2021-02-25T13:12:12.427Z", + "fileLength": 62184, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3213/282/ftb-ultimine-1605.2.0-build.21-forge.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3216/601/ftb-ultimine-1605.2.0-build.22-forge.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { "id": 0, - "addonId": 348521, + "addonId": 419699, "type": 3, "fileId": 0 }, { "id": 0, - "addonId": 419699, + "addonId": 348521, "type": 3, "fileId": 0 } @@ -17771,13 +17771,13 @@ }, { "foldername": "META-INF", - "fingerprint": 64495862, + "fingerprint": 1925849703, "type": 0, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 530251894, + "fingerprint": 1808941298, "type": 0, "invalidFingerprint": false }, @@ -17788,7 +17788,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 4271777122, + "packageFingerprint": 3647702607, "gameVersion": [ "1.16.5", "Forge", @@ -17803,12 +17803,12 @@ "gameVersionDateReleased": "2008-03-01T06:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "ftb-ultimine-1605.2.0-build.21-forge.jar" + "FileNameOnDisk": "ftb-ultimine-1605.2.0-build.22-forge.jar" }, "dateInstalled": "2021-02-22T18:09:56.0613625Z", - "dateUpdated": "2021-02-22T21:43:28.1789995Z", - "dateLastUpdateAttempted": "2021-02-22T21:43:28.1789995Z", - "status": 5, + "dateUpdated": "2021-02-25T19:53:27.2643837Z", + "dateLastUpdateAttempted": "2021-02-25T19:53:27.2643837Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -17916,18 +17916,117 @@ "manifestName": null, "installedTargets": null }, + { + "addonID": 245211, + "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", + "installedFile": { + "id": 3157997, + "displayName": "TheOneProbe - 1.16-3.0.7", + "fileName": "theoneprobe-1.16-3.0.7.jar", + "fileDate": "2021-01-04T07:28:14.593Z", + "fileLength": 307065, + "releaseType": 1, + "fileStatus": 4, + "downloadUrl": "https://edge.forgecdn.net/files/3157/997/theoneprobe-1.16-3.0.7.jar", + "isAlternate": false, + "alternateFileId": 0, + "dependencies": [ + { + "id": 0, + "addonId": 270789, + "type": 2, + "fileId": 0 + }, + { + "id": 0, + "addonId": 227083, + "type": 2, + "fileId": 0 + }, + { + "id": 0, + "addonId": 244651, + "type": 2, + "fileId": 0 + } + ], + "isAvailable": true, + "modules": [ + { + "foldername": "META-INF", + "fingerprint": 2279319940, + "type": 0, + "invalidFingerprint": false + }, + { + "foldername": "mcjty", + "fingerprint": 3108423740, + "type": 0, + "invalidFingerprint": false + }, + { + "foldername": "assets", + "fingerprint": 3749773231, + "type": 0, + "invalidFingerprint": false + }, + { + "foldername": "pack.mcmeta", + "fingerprint": 3099463473, + "type": 0, + "invalidFingerprint": false + }, + { + "foldername": "data", + "fingerprint": 2393313921, + "type": 0, + "invalidFingerprint": false + } + ], + "packageFingerprint": 1240636736, + "gameVersion": [ + "1.16.3", + "1.16.5", + "Forge", + "1.16.4" + ], + "hasInstallScript": false, + "isCompatibleWithClient": false, + "categorySectionPackageType": 0, + "restrictProjectFileAccess": 0, + "projectStatus": 0, + "projectId": 0, + "gameVersionDateReleased": "2008-03-01T06:00:00Z", + "gameId": 0, + "isServerPack": false, + "FileNameOnDisk": "theoneprobe-1.16-3.0.7.jar" + }, + "dateInstalled": "2021-02-25T13:49:43.004904Z", + "dateUpdated": "2021-02-25T13:49:43.0148641Z", + "dateLastUpdateAttempted": "2021-02-25T13:49:43.0148641Z", + "status": 4, + "preferenceAutoInstallUpdates": null, + "preferenceAlternateFile": false, + "preferenceIsIgnored": false, + "isModified": false, + "isWorkingCopy": false, + "isFuzzyMatch": false, + "preferenceReleaseType": null, + "manifestName": null, + "installedTargets": null + }, { "addonID": 419699, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3216365, - "displayName": "[Forge 1.16.4/5] v1.8.121", - "fileName": "architectury-1.8.121-forge.jar", - "fileDate": "2021-02-25T07:05:59.263Z", - "fileLength": 301666, + "id": 3216801, + "displayName": "[Forge 1.16.4/5] v1.8.122", + "fileName": "architectury-1.8.122-forge.jar", + "fileDate": "2021-02-25T16:40:45.953Z", + "fileLength": 301871, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3216/365/architectury-1.8.121-forge.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3216/801/architectury-1.8.122-forge.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -17965,19 +18064,19 @@ }, { "foldername": "META-INF", - "fingerprint": 3082881993, + "fingerprint": 1871218950, "type": 0, "invalidFingerprint": false }, { "foldername": "me", - "fingerprint": 1004427649, + "fingerprint": 1809928500, "type": 0, "invalidFingerprint": false }, { - "foldername": "architectury_inject_architectury_common_aac7f9421eeb4ac88fddbe860828042b", - "fingerprint": 1458284797, + "foldername": "architectury_inject_architectury_common_3b0398c9183e4a00b78ece7c4e55260e", + "fingerprint": 752247596, "type": 0, "invalidFingerprint": false }, @@ -17988,7 +18087,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 1291383060, + "packageFingerprint": 2086191476, "gameVersion": [ "1.16.5", "Forge", @@ -18003,11 +18102,11 @@ "gameVersionDateReleased": "2008-03-01T06:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "architectury-1.8.121-forge.jar" + "FileNameOnDisk": "architectury-1.8.122-forge.jar" }, "dateInstalled": "2021-02-15T21:03:42.3542083Z", - "dateUpdated": "2021-02-25T07:21:10.9477509Z", - "dateLastUpdateAttempted": "2021-02-25T07:21:10.9477509Z", + "dateUpdated": "2021-02-25T19:53:21.2476859Z", + "dateLastUpdateAttempted": "2021-02-25T19:53:21.2476859Z", "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -21685,115 +21784,85 @@ "addonID": 319194, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3100982, - "displayName": "glassential-forge-1.16.4-1.1.5.jar", - "fileName": "glassential-forge-1.16.4-1.1.5.jar", - "fileDate": "2020-11-03T14:17:57.577Z", - "fileLength": 43785, + "id": 3216634, + "displayName": "glassential-forge-1.16.5-1.1.6.jar", + "fileName": "glassential-forge-1.16.5-1.1.6.jar", + "fileDate": "2021-02-25T13:42:07.75Z", + "fileLength": 44282, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3100/982/glassential-forge-1.16.4-1.1.5.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3216/634/glassential-forge-1.16.5-1.1.6.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { - "id": 54481144, + "id": 0, "addonId": 267602, "type": 2, - "fileId": 3100982 + "fileId": 0 } ], "isAvailable": true, "modules": [ { "foldername": "META-INF", - "fingerprint": 2384957919, - "type": 3, + "fingerprint": 229554748, + "type": 0, "invalidFingerprint": false }, { "foldername": "lykrast", "fingerprint": 2802899706, - "type": 3, + "type": 0, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 726087839, - "type": 3, + "fingerprint": 4287848977, + "type": 0, "invalidFingerprint": false }, { "foldername": "data", "fingerprint": 3462236109, - "type": 3, + "type": 0, "invalidFingerprint": false }, { "foldername": "logo.png", "fingerprint": 2983663141, - "type": 3, + "type": 0, "invalidFingerprint": false }, { "foldername": "pack.mcmeta", "fingerprint": 3143254585, - "type": 3, + "type": 0, "invalidFingerprint": false } ], - "packageFingerprint": 352932532, + "packageFingerprint": 1793251200, "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" - }, - { - "gameVersionPadded": "0000000001.0000000016.0000000005", - "gameVersion": "1.16.5", - "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z", - "gameVersionName": "1.16.5" - }, - { - "gameVersionPadded": "0", - "gameVersion": "", - "gameVersionReleaseDate": "2019-08-01T00:00:00Z", - "gameVersionName": "Forge" - }, - { - "gameVersionPadded": "0000000001.0000000016.0000000004", - "gameVersion": "1.16.4", - "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z", - "gameVersionName": "1.16.4" - } - ], "hasInstallScript": false, "isCompatibleWithClient": false, - "categorySectionPackageType": 6, - "restrictProjectFileAccess": 1, - "projectStatus": 4, - "renderCacheId": 2040870, - "projectId": 319194, - "packageFingerprintId": 547611446, + "categorySectionPackageType": 0, + "restrictProjectFileAccess": 0, + "projectStatus": 0, + "projectId": 0, "gameVersionDateReleased": "2019-08-01T00:00:00Z", - "gameVersionMappingId": 2511228, - "gameVersionId": 7498, - "gameId": 432, + "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "glassential-forge-1.16.4-1.1.5.jar" + "FileNameOnDisk": "glassential-forge-1.16.5-1.1.6.jar" }, "dateInstalled": "2021-01-24T23:41:09.7577715Z", - "dateUpdated": "2021-01-24T23:41:09.7577715Z", - "dateLastUpdateAttempted": "0001-01-01T00:00:00", - "status": 5, + "dateUpdated": "2021-02-25T19:53:27.1253844Z", + "dateLastUpdateAttempted": "2021-02-25T19:53:27.1253844Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -25223,14 +25292,14 @@ "addonID": 60028, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3202121, - "displayName": "Aquaculture-1.16.5-2.1.15.jar", - "fileName": "Aquaculture-1.16.5-2.1.15.jar", - "fileDate": "2021-02-13T01:40:17.297Z", - "fileLength": 546453, + "id": 3216633, + "displayName": "Aquaculture-1.16.5-2.1.16.jar", + "fileName": "Aquaculture-1.16.5-2.1.16.jar", + "fileDate": "2021-02-25T13:41:50.677Z", + "fileLength": 546660, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3202/121/Aquaculture-1.16.5-2.1.15.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3216/633/Aquaculture-1.16.5-2.1.16.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -25238,13 +25307,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 3860940277, + "fingerprint": 2483215382, "type": 0, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 1344058929, + "fingerprint": 916084320, "type": 0, "invalidFingerprint": false }, @@ -25267,11 +25336,10 @@ "invalidFingerprint": false } ], - "packageFingerprint": 3726223298, + "packageFingerprint": 2725942653, "gameVersion": [ "1.16.5", - "Forge", - "1.16.4" + "Forge" ], "hasInstallScript": false, "isCompatibleWithClient": false, @@ -25282,12 +25350,12 @@ "gameVersionDateReleased": "2019-08-01T00:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "Aquaculture-1.16.5-2.1.15.jar" + "FileNameOnDisk": "Aquaculture-1.16.5-2.1.16.jar" }, "dateInstalled": "2021-01-24T23:41:09.759766Z", - "dateUpdated": "2021-02-13T20:01:41.1682927Z", - "dateLastUpdateAttempted": "2021-02-13T20:01:41.1682927Z", - "status": 5, + "dateUpdated": "2021-02-25T19:53:19.1154754Z", + "dateLastUpdateAttempted": "2021-02-25T19:53:19.1154754Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, From ecbc1451dd715be59fcae1ef81e3669cfb63b626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 21:24:20 +0100 Subject: [PATCH 22/35] added missing reward #1421 --- config/ftbquests/quests/chapters/thermal_series.snbt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/ftbquests/quests/chapters/thermal_series.snbt b/config/ftbquests/quests/chapters/thermal_series.snbt index 34a25de380..e785c61e24 100644 --- a/config/ftbquests/quests/chapters/thermal_series.snbt +++ b/config/ftbquests/quests/chapters/thermal_series.snbt @@ -756,6 +756,14 @@ id: "0000000000000F79", type: "item", item: "thermal:machine_centrifuge" + }], + rewards: [{ + id: "5839B6FFB471A35B", + type: "command", + title: "Rare Thermal Series Loot Box", + icon: "kubejs:rare_lootbox", + command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:chests/quest_thermal_series_loot_rare", + player_command: false }] }, { From 421cbc20155bfdaa8788aa4c439dd3805b972b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 22:33:44 +0100 Subject: [PATCH 23/35] all stones tagged with quark:stone_tool_materials can now be used for Tetra tools, fixes #1395 --- kubejs/assets/tetra/lang/en_us.json | 2 ++ .../tetra/materials/stone/compat/stones.json | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 kubejs/data/tetra/materials/stone/compat/stones.json diff --git a/kubejs/assets/tetra/lang/en_us.json b/kubejs/assets/tetra/lang/en_us.json index 5b9aef3536..8aba39e6b9 100644 --- a/kubejs/assets/tetra/lang/en_us.json +++ b/kubejs/assets/tetra/lang/en_us.json @@ -83,6 +83,8 @@ "tetra.material.spirited.prefix": "spirited", "tetra.material.starmetal": "Starmetal", "tetra.material.starmetal.prefix": "Starmetal", + "tetra.material.stones": "Stone", + "tetra.material.stones.prefix": "Stone", "tetra.material.terrasteel": "Terrasteel", "tetra.material.terrasteel.prefix": "Terrasteel", "tetra.material.zinc": "Zinc", diff --git a/kubejs/data/tetra/materials/stone/compat/stones.json b/kubejs/data/tetra/materials/stone/compat/stones.json new file mode 100644 index 0000000000..d69b1c3749 --- /dev/null +++ b/kubejs/data/tetra/materials/stone/compat/stones.json @@ -0,0 +1,17 @@ +{ + "key": "stones", + "category": "stones", + "primary": "4", + "secondary": "3", + "tertiary": "0", + "durability": "131", + "integrityCost": "1", + "integrityGain": "4", + "magicCapacity": "90", + "toolLevel": "2", + "toolEfficiency": "4", + "tints": { "glyph": "stone_glyph", "texture": "stone" }, + "textures": ["crude", "default"], + "material": { "tag": "quark:stone_tool_materials" }, + "requiredTools": { "hammer": 1 } +} From 3c8e75823adcfea6e5c5065c851d531eed635919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 22:39:33 +0100 Subject: [PATCH 24/35] warnings against upgrading backpacks with content #1406 --- config/ftbquests/quests/chapters/storage.snbt | 7 ++++++- kubejs/client_scripts/item_modifiers/jei_descriptions.js | 8 ++++++++ kubejs/client_scripts/item_modifiers/tooltips.js | 8 ++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/storage.snbt b/config/ftbquests/quests/chapters/storage.snbt index c3a309c9a9..cf64a27c38 100644 --- a/config/ftbquests/quests/chapters/storage.snbt +++ b/config/ftbquests/quests/chapters/storage.snbt @@ -805,12 +805,15 @@ rewards: [{ id: "0000000000000997", type: "item", - item: "sophisticatedbackpacks:backpack" + icon: "minecraft:leather", + item: "minecraft:leather", + random_bonus: 3 }] }, { x: 2.0d, y: -6.5d, + description: ["It's a good idea to remove items from your Backpack before upgrading it."], dependencies: ["0000000000000986"], id: "0000000000000988", tasks: [{ @@ -830,6 +833,7 @@ { x: 3.0d, y: -6.0d, + description: ["It's a good idea to remove items from your Backpack before upgrading it."], dependencies: ["0000000000000988"], id: "000000000000098A", tasks: [{ @@ -849,6 +853,7 @@ { x: 4.0d, y: -6.0d, + description: ["It's a good idea to remove items from your Backpack before upgrading it."], dependencies: ["000000000000098A"], id: "000000000000098C", tasks: [{ diff --git a/kubejs/client_scripts/item_modifiers/jei_descriptions.js b/kubejs/client_scripts/item_modifiers/jei_descriptions.js index 6ff5c40d1f..1d17c86cbf 100644 --- a/kubejs/client_scripts/item_modifiers/jei_descriptions.js +++ b/kubejs/client_scripts/item_modifiers/jei_descriptions.js @@ -32,6 +32,14 @@ events.listen('jei.information', (event) => { description: [ 'Uraninite Ore has been removed and does not spawn naturally. To obtain Uraninite, use the Powah Energizing Orb recipe.' ] + }, + { + item: /sophisticatedbackpacks:\w+backpack/, + description: ['Clear before upgrading!'] + }, + { + item: 'sophisticatedbackpacks:backpack', + description: ['Clear before upgrading!'] } ] }; diff --git a/kubejs/client_scripts/item_modifiers/tooltips.js b/kubejs/client_scripts/item_modifiers/tooltips.js index 05cbe1f2a7..ca0b4a4c2b 100644 --- a/kubejs/client_scripts/item_modifiers/tooltips.js +++ b/kubejs/client_scripts/item_modifiers/tooltips.js @@ -7,6 +7,14 @@ onEvent('item.tooltip', (event) => { 'Do not use, you will crash immediately if in multiplayer. We have notified the mod author about the issue.' ).red() ] + }, + { + item: /sophisticatedbackpacks:\w+backpack/, + text: [Text.of('Clear before upgrading!').red()] + }, + { + item: 'sophisticatedbackpacks:backpack', + text: [Text.of('Clear before upgrading!').red()] } ]; From 2b307ca884b64e02da799b21e07dd001868982ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 22:39:37 +0100 Subject: [PATCH 25/35] Update settings.ps1 --- settings.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.ps1 b/settings.ps1 index d6ebd4b7d0..0fed5aa5ee 100644 --- a/settings.ps1 +++ b/settings.ps1 @@ -62,10 +62,10 @@ $CURSEFORGE_PROJECT_ID = 389471 # =====================================================================// # Default: "1.0.0" -$MODPACK_VERSION = "0.4.0" +$MODPACK_VERSION = "0.4.1" # Only used by the Changelog Generator -$LAST_MODPACK_VERSION = "0.3.13" +$LAST_MODPACK_VERSION = "0.4.0" $FORGE_VERSION = 36.0.40 From 3a9cce0dc5a6f2ec9ab64152e8ab0033dc5875cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 23:14:13 +0100 Subject: [PATCH 26/35] buffed advanced and elite mekanism bins --- config/Mekanism/tiers.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/Mekanism/tiers.toml b/config/Mekanism/tiers.toml index 6d29b6c8b8..8c79744eee 100644 --- a/config/Mekanism/tiers.toml +++ b/config/Mekanism/tiers.toml @@ -48,10 +48,10 @@ basicStorage = 4096 #The number of items Elite bins can store. #Range: > 1 - eliteStorage = 32768 + eliteStorage = 65536 #The number of items Advanced bins can store. #Range: > 1 - advancedStorage = 8192 + advancedStorage = 16384 #Induction [tier.induction] From 49cb977ea594a59eca658e8a53f94cf8f22a0f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Thu, 25 Feb 2021 23:14:40 +0100 Subject: [PATCH 27/35] Update CHANGELOG.md --- changelogs/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index 4bfb2bcbcd..91c9fa4891 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -13,6 +13,7 @@ _Using Forge-1.16.5-36.0.40_ | _[Mod Updates](https://github.com/NillerMedDild/E - Raccoon - Crow - Editing Signs now requires an empty hand +- Mekansim: Advanced and Elite Bins can no hold more stacks of items **Bug Fixes** From e7723a1e0ab773b840895b9cdf7a541e47b61444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Fri, 26 Feb 2021 06:42:50 +0100 Subject: [PATCH 28/35] fixed #1421 --- config/ftbquests/quests/chapters/thermal_series.snbt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/ftbquests/quests/chapters/thermal_series.snbt b/config/ftbquests/quests/chapters/thermal_series.snbt index e785c61e24..5145d09c95 100644 --- a/config/ftbquests/quests/chapters/thermal_series.snbt +++ b/config/ftbquests/quests/chapters/thermal_series.snbt @@ -738,6 +738,14 @@ type: "item", title: "Crude Oil", item: "pneumaticcraft:oil_bucket" + }], + rewards: [{ + id: "124C10AC728F1A8C", + type: "command", + title: "Rare Thermal Series Loot Box", + icon: "kubejs:rare_lootbox", + command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:chests/quest_thermal_series_loot_rare", + player_command: false }] }, { From c8d86a9e0da48ea3f23c8804808ca9ad1a350290 Mon Sep 17 00:00:00 2001 From: theboo Date: Thu, 25 Feb 2021 21:58:18 -0800 Subject: [PATCH 29/35] Lowered artifact rates in end city loot --- .../loot_tables/chests/end_city_treasure.json | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/kubejs/data/minecraft/loot_tables/chests/end_city_treasure.json b/kubejs/data/minecraft/loot_tables/chests/end_city_treasure.json index 58b7a4d663..c43b5bca20 100644 --- a/kubejs/data/minecraft/loot_tables/chests/end_city_treasure.json +++ b/kubejs/data/minecraft/loot_tables/chests/end_city_treasure.json @@ -305,16 +305,6 @@ "treasure": true } ] - }, - { - "type": "loot_table", - "weight": 40, - "name": "artifacts:artifact" - }, - { - "type": "item", - "weight": 5, - "name": "artifacts:crystal_heart" } ] }, @@ -339,6 +329,27 @@ "name": "minecraft:elytra" } ] + }, + { + "rolls": 1, + "conditions": [ + { + "condition": "random_chance", + "chance": 0.3 + } + ], + "entries": [ + { + "type": "loot_table", + "weight": 3, + "name": "artifacts:artifact" + }, + { + "type": "item", + "weight": 1, + "name": "artifacts:crystal_heart" + } + ] } ] -} \ No newline at end of file +} From 28fd71a2e61e8da50e27b67a003ed68fbb5e1ec9 Mon Sep 17 00:00:00 2001 From: theboo Date: Thu, 25 Feb 2021 23:01:45 -0800 Subject: [PATCH 30/35] convert autumnity large pumpkin slice to vanilla pumpkin --- .../server_scripts/enigmatica/kubejs/base/recipes/shapeless.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js index df0d92a10e..77c4a3b296 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js @@ -5,6 +5,7 @@ events.listen('recipes', (event) => { { output: 'minecraft:flint', inputs: ['#forge:gravel', '#forge:gravel', '#forge:gravel'] }, { output: 'simplefarming:cornbread', inputs: ['#forge:grain', '#forge:crops/corn', '#forge:grain'] }, { output: 'minecraft:chest', inputs: ['#forge:chests/wooden'] }, + { output: 'minecraft:pumpkin', inputs: ['autumnity:large_pumpkin_slice'] }, { output: 'minecraft:crafting_table', inputs: ['craftingstation:crafting_station_slab', 'craftingstation:crafting_station_slab'] From c2ddb9567845e5878c6a78ecf0c778b1e6868f56 Mon Sep 17 00:00:00 2001 From: theboo Date: Fri, 26 Feb 2021 07:26:59 -0800 Subject: [PATCH 31/35] lowered artifact pool chance a bit, made crystal hearts more rare --- .../data/minecraft/loot_tables/chests/end_city_treasure.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/data/minecraft/loot_tables/chests/end_city_treasure.json b/kubejs/data/minecraft/loot_tables/chests/end_city_treasure.json index c43b5bca20..3251811e40 100644 --- a/kubejs/data/minecraft/loot_tables/chests/end_city_treasure.json +++ b/kubejs/data/minecraft/loot_tables/chests/end_city_treasure.json @@ -335,13 +335,13 @@ "conditions": [ { "condition": "random_chance", - "chance": 0.3 + "chance": 0.2 } ], "entries": [ { "type": "loot_table", - "weight": 3, + "weight": 8, "name": "artifacts:artifact" }, { From 040d94c92c64ad95f52b3c32f03d6a4f0552893e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Fri, 26 Feb 2021 20:27:00 +0100 Subject: [PATCH 32/35] cable -> capable, #1139 --- .../quests/chapters/industrial_foregoing.snbt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/config/ftbquests/quests/chapters/industrial_foregoing.snbt b/config/ftbquests/quests/chapters/industrial_foregoing.snbt index c1ab0ff992..2cbeed09a7 100644 --- a/config/ftbquests/quests/chapters/industrial_foregoing.snbt +++ b/config/ftbquests/quests/chapters/industrial_foregoing.snbt @@ -932,7 +932,7 @@ { x: 10.0d, y: -9.0d, - description: ["A block cable of storing big amounts of an item, you can insert or extract items by interacting with the front."], + description: ["A block capable of storing big amounts of an item, you can insert or extract items by interacting with the front."], hide_dependency_lines: true, dependencies: ["000000000000004A"], id: "0000000000000F10", @@ -950,7 +950,7 @@ { x: 10.0d, y: -8.0d, - description: ["A block cable of storing big amounts of an item, you can insert or extract items by interacting with the front."], + description: ["A block capable of storing big amounts of an item, you can insert or extract items by interacting with the front."], hide_dependency_lines: true, dependencies: ["000000000000004D"], id: "0000000000000F12", @@ -968,7 +968,7 @@ { x: 10.0d, y: -7.0d, - description: ["A block cable of storing big amounts of an item, you can insert or extract items by interacting with the front."], + description: ["A block capable of storing big amounts of an item, you can insert or extract items by interacting with the front."], hide_dependency_lines: true, dependencies: ["0000000000000051"], id: "0000000000000F14", @@ -986,7 +986,7 @@ { x: 10.0d, y: -6.0d, - description: ["A block cable of storing big amounts of an item, you can insert or extract items by interacting with the front."], + description: ["A block capable of storing big amounts of an item, you can insert or extract items by interacting with the front."], hide_dependency_lines: true, dependencies: ["0000000000000078"], id: "0000000000000F16", @@ -1004,7 +1004,7 @@ { x: 10.0d, y: -5.0d, - description: ["A block cable of storing big amounts of an item, you can insert or extract items by interacting with the front."], + description: ["A block capable of storing big amounts of an item, you can insert or extract items by interacting with the front."], hide_dependency_lines: true, dependencies: ["0000000000000EDC"], id: "0000000000000F18", @@ -1022,7 +1022,7 @@ { x: 12.0d, y: -9.0d, - description: ["A block cable of storing big amounts of a fluid."], + description: ["A block capable of storing big amounts of a fluid."], hide_dependency_lines: true, dependencies: ["000000000000004A"], id: "0000000000000F1A", @@ -1040,7 +1040,7 @@ { x: 12.0d, y: -8.0d, - description: ["A block cable of storing big amounts of a fluid."], + description: ["A block capable of storing big amounts of a fluid."], hide_dependency_lines: true, dependencies: ["000000000000004D"], id: "0000000000000F1C", @@ -1058,7 +1058,7 @@ { x: 12.0d, y: -7.0d, - description: ["A block cable of storing big amounts of a fluid."], + description: ["A block capable of storing big amounts of a fluid."], hide_dependency_lines: true, dependencies: ["0000000000000051"], id: "0000000000000F1E", @@ -1076,7 +1076,7 @@ { x: 12.0d, y: -6.0d, - description: ["A block cable of storing big amounts of a fluid."], + description: ["A block capable of storing big amounts of a fluid."], hide_dependency_lines: true, dependencies: ["0000000000000078"], id: "0000000000000F20", @@ -1094,7 +1094,7 @@ { x: 12.0d, y: -5.0d, - description: ["A block cable of storing big amounts of a fluid."], + description: ["A block capable of storing big amounts of a fluid."], hide_dependency_lines: true, dependencies: ["0000000000000EDC"], id: "0000000000000F22", From 28309af824b4cbaf3bae29993f932fe6722e2efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Fri, 26 Feb 2021 20:27:11 +0100 Subject: [PATCH 33/35] never ending array shuffle --- config/sophisticatedbackpacks-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sophisticatedbackpacks-common.toml b/config/sophisticatedbackpacks-common.toml index 16ad9bafe2..53c1a83317 100644 --- a/config/sophisticatedbackpacks-common.toml +++ b/config/sophisticatedbackpacks-common.toml @@ -239,7 +239,7 @@ #Turns on/off buffing the entity that wears backpack with potion effects. These are scaled based on how much loot is added. buffWithPotionEffects = true #Map of entities that can spawn with backpack and related loot tables (if adding a loot is enabled) in format of "EntityRegistryName|LootTableName - entityLootTableList = ["minecraft:enderman|minecraft:chests/end_city_treasure", "minecraft:piglin|minecraft:chests/bastion_bridge", "minecraft:piglin_brute|minecraft:chests/bastion_treasure", "minecraft:creeper|minecraft:chests/desert_pyramid", "minecraft:drowned|minecraft:chests/shipwreck_treasure", "minecraft:stray|minecraft:chests/igloo_chest", "minecraft:evoker|minecraft:chests/woodland_mansion", "minecraft:husk|minecraft:chests/desert_pyramid", "minecraft:zombie|minecraft:chests/simple_dungeon", "minecraft:witch|minecraft:chests/buried_treasure", "minecraft:pillager|minecraft:chests/pillager_outpost", "minecraft:zombified_piglin|minecraft:chests/bastion_other", "minecraft:zombie_villager|minecraft:chests/village/village_armorer", "minecraft:skeleton|minecraft:chests/simple_dungeon", "minecraft:wither_skeleton|minecraft:chests/nether_bridge", "minecraft:vindicator|minecraft:chests/woodland_mansion", "minecraft:vex|minecraft:chests/woodland_mansion"] + entityLootTableList = ["minecraft:vex|minecraft:chests/woodland_mansion", "minecraft:witch|minecraft:chests/buried_treasure", "minecraft:zombie_villager|minecraft:chests/village/village_armorer", "minecraft:pillager|minecraft:chests/pillager_outpost", "minecraft:husk|minecraft:chests/desert_pyramid", "minecraft:vindicator|minecraft:chests/woodland_mansion", "minecraft:wither_skeleton|minecraft:chests/nether_bridge", "minecraft:creeper|minecraft:chests/desert_pyramid", "minecraft:skeleton|minecraft:chests/simple_dungeon", "minecraft:stray|minecraft:chests/igloo_chest", "minecraft:zombified_piglin|minecraft:chests/bastion_other", "minecraft:piglin_brute|minecraft:chests/bastion_treasure", "minecraft:drowned|minecraft:chests/shipwreck_treasure", "minecraft:zombie|minecraft:chests/simple_dungeon", "minecraft:evoker|minecraft:chests/woodland_mansion", "minecraft:piglin|minecraft:chests/bastion_bridge", "minecraft:enderman|minecraft:chests/end_city_treasure"] #Netherite Backpack Settings [common.netheriteBackpack] From fe838e0bb1c966ff6faabc9ea155cfbb2ee70f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Fri, 26 Feb 2021 20:27:22 +0100 Subject: [PATCH 34/35] mod updates --- config/supplementaries-common.toml | 2 +- config/supplementaries-registry.toml | 5 + minecraftinstance.json | 219 ++++++++++++++------------- 3 files changed, 116 insertions(+), 110 deletions(-) diff --git a/config/supplementaries-common.toml b/config/supplementaries-common.toml index b1da1b24d1..40b830bd89 100644 --- a/config/supplementaries-common.toml +++ b/config/supplementaries-common.toml @@ -71,7 +71,7 @@ allow_any_item = false [blocks.sack] - #penalize the player with slowness effecn when carring too many sacks + #penalize the player with slowness effect when carrying too many sacks sack_penality = true #maximum number of sacks after which the slowness effect will be applied. each multiple of this number will further slow the player down #Range: 0 ~ 50 diff --git a/config/supplementaries-registry.toml b/config/supplementaries-registry.toml index 95bfc1a8b1..76ced7df9a 100644 --- a/config/supplementaries-registry.toml +++ b/config/supplementaries-registry.toml @@ -51,6 +51,11 @@ gold_trapdoor = true gold_door = true bamboo_spikes = true + checker_block = true + netherite_door = true + netherite_trapdoor = true + pancake = true + lock_block = true [registration.entities] firefly = true diff --git a/minecraftinstance.json b/minecraftinstance.json index d3602d213f..ae095fe751 100644 --- a/minecraftinstance.json +++ b/minecraftinstance.json @@ -30,7 +30,7 @@ "isUnlocked": true, "javaArgsOverride": null, "javaDirOverride": null, - "lastPlayed": "2021-02-25T19:53:38.0009897Z", + "lastPlayed": "2021-02-26T18:51:56.9477532Z", "manifest": null, "fileDate": "0001-01-01T00:00:00", "installedModpack": null, @@ -46,7 +46,7 @@ "name": "Enigmatica6", "cachedScans": [], "isValid": true, - "lastPreviousMatchUpdate": "2021-02-25T12:25:45.0146117Z", + "lastPreviousMatchUpdate": "2021-02-25T21:09:04.7153394Z", "isEnabled": true, "isPinned": false, "gameVersion": "1.16.5", @@ -6296,14 +6296,14 @@ "addonID": 412082, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3206315, - "displayName": "supplementaries-1.16.5-0.9.27.jar", - "fileName": "supplementaries-1.16.5-0.9.27.jar", - "fileDate": "2021-02-16T18:08:35.89Z", - "fileLength": 3735320, + "id": 3218015, + "displayName": "supplementaries-1.16.5-0.10.0a.jar", + "fileName": "supplementaries-1.16.5-0.10.0a.jar", + "fileDate": "2021-02-26T15:06:36.347Z", + "fileLength": 3922866, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3206/315/supplementaries-1.16.5-0.9.27.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3218/15/supplementaries-1.16.5-0.10.0a.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -6311,25 +6311,25 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 3584987536, + "fingerprint": 48596043, "type": 0, "invalidFingerprint": false }, { "foldername": "net", - "fingerprint": 1871320877, + "fingerprint": 2474868600, "type": 0, "invalidFingerprint": false }, { "foldername": "assets", - "fingerprint": 3483920257, + "fingerprint": 550961827, "type": 0, "invalidFingerprint": false }, { "foldername": "data", - "fingerprint": 3014505972, + "fingerprint": 2676215391, "type": 0, "invalidFingerprint": false }, @@ -6347,18 +6347,18 @@ }, { "foldername": "supplementaries.mixins.json", - "fingerprint": 1737017236, + "fingerprint": 4101375625, "type": 0, "invalidFingerprint": false }, { "foldername": "supplementaries.refmap.json", - "fingerprint": 2985202954, + "fingerprint": 3443528000, "type": 0, "invalidFingerprint": false } ], - "packageFingerprint": 2369891720, + "packageFingerprint": 3914841654, "gameVersion": [ "1.16.3", "1.16.5", @@ -6374,12 +6374,12 @@ "gameVersionDateReleased": "2019-08-01T00:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "supplementaries-1.16.5-0.9.27.jar" + "FileNameOnDisk": "supplementaries-1.16.5-0.10.0a.jar" }, "dateInstalled": "2021-02-08T19:32:52.7307141Z", - "dateUpdated": "2021-02-16T19:31:00.7602641Z", - "dateLastUpdateAttempted": "2021-02-16T19:31:00.7602641Z", - "status": 5, + "dateUpdated": "2021-02-26T18:44:05.4658212Z", + "dateLastUpdateAttempted": "2021-02-26T18:44:05.4658212Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -8428,7 +8428,7 @@ "dateInstalled": "2021-01-24T23:41:09.6999357Z", "dateUpdated": "2021-02-24T21:23:43.4641676Z", "dateLastUpdateAttempted": "2021-02-24T21:23:43.4641676Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -11685,51 +11685,51 @@ "addonID": 289412, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3216005, - "displayName": "ftb-quests-1605.2.0-build.31-forge.jar", - "fileName": "ftb-quests-1605.2.0-build.31-forge.jar", - "fileDate": "2021-02-24T23:04:28.47Z", - "fileLength": 869535, + "id": 3217206, + "displayName": "ftb-quests-1605.2.0-build.32-forge.jar", + "fileName": "ftb-quests-1605.2.0-build.32-forge.jar", + "fileDate": "2021-02-25T21:36:18.133Z", + "fileLength": 869555, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3216/5/ftb-quests-1605.2.0-build.31-forge.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3217/206/ftb-quests-1605.2.0-build.32-forge.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { "id": 0, - "addonId": 238222, - "type": 2, + "addonId": 309674, + "type": 3, "fileId": 0 }, { "id": 0, - "addonId": 238086, - "type": 2, + "addonId": 419699, + "type": 3, "fileId": 0 }, { "id": 0, - "addonId": 268655, + "addonId": 238222, "type": 2, "fileId": 0 }, { "id": 0, - "addonId": 309674, - "type": 3, + "addonId": 268655, + "type": 2, "fileId": 0 }, { "id": 0, - "addonId": 419699, + "addonId": 404465, "type": 3, "fileId": 0 }, { "id": 0, - "addonId": 404465, - "type": 3, + "addonId": 238086, + "type": 2, "fileId": 0 } ], @@ -11767,13 +11767,13 @@ }, { "foldername": "META-INF", - "fingerprint": 3494267452, + "fingerprint": 4024141504, "type": 0, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 4134538478, + "fingerprint": 3418305850, "type": 0, "invalidFingerprint": false }, @@ -11784,7 +11784,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 2064251060, + "packageFingerprint": 2712033935, "gameVersion": [ "1.16.5", "Forge", @@ -11799,11 +11799,11 @@ "gameVersionDateReleased": "2008-03-01T06:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "ftb-quests-1605.2.0-build.31-forge.jar" + "FileNameOnDisk": "ftb-quests-1605.2.0-build.32-forge.jar" }, "dateInstalled": "2021-02-22T21:40:14.8709548Z", - "dateUpdated": "2021-02-25T06:06:57.1376602Z", - "dateLastUpdateAttempted": "2021-02-25T06:06:57.1376602Z", + "dateUpdated": "2021-02-26T18:44:00.3801289Z", + "dateLastUpdateAttempted": "2021-02-26T18:44:00.3801289Z", "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -18004,7 +18004,7 @@ "dateInstalled": "2021-02-25T13:49:43.004904Z", "dateUpdated": "2021-02-25T13:49:43.0148641Z", "dateLastUpdateAttempted": "2021-02-25T13:49:43.0148641Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -18019,14 +18019,14 @@ "addonID": 419699, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3216801, - "displayName": "[Forge 1.16.4/5] v1.8.122", - "fileName": "architectury-1.8.122-forge.jar", - "fileDate": "2021-02-25T16:40:45.953Z", - "fileLength": 301871, + "id": 3217852, + "displayName": "[Forge 1.16.4/5] v1.8.126", + "fileName": "architectury-1.8.126-forge.jar", + "fileDate": "2021-02-26T12:41:36.513Z", + "fileLength": 301909, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3216/801/architectury-1.8.122-forge.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3217/852/architectury-1.8.126-forge.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -18064,19 +18064,19 @@ }, { "foldername": "META-INF", - "fingerprint": 1871218950, + "fingerprint": 2686388708, "type": 0, "invalidFingerprint": false }, { "foldername": "me", - "fingerprint": 1809928500, + "fingerprint": 1143909406, "type": 0, "invalidFingerprint": false }, { - "foldername": "architectury_inject_architectury_common_3b0398c9183e4a00b78ece7c4e55260e", - "fingerprint": 752247596, + "foldername": "architectury_inject_architectury_common_93c33c9626574fa0a3836bda84507e50", + "fingerprint": 3927188876, "type": 0, "invalidFingerprint": false }, @@ -18087,7 +18087,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 2086191476, + "packageFingerprint": 3895191776, "gameVersion": [ "1.16.5", "Forge", @@ -18102,11 +18102,11 @@ "gameVersionDateReleased": "2008-03-01T06:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "architectury-1.8.122-forge.jar" + "FileNameOnDisk": "architectury-1.8.126-forge.jar" }, "dateInstalled": "2021-02-15T21:03:42.3542083Z", - "dateUpdated": "2021-02-25T19:53:21.2476859Z", - "dateLastUpdateAttempted": "2021-02-25T19:53:21.2476859Z", + "dateUpdated": "2021-02-26T18:44:01.5586634Z", + "dateLastUpdateAttempted": "2021-02-26T18:44:01.5586634Z", "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -19600,7 +19600,7 @@ "dateInstalled": "2021-02-23T16:23:57.8317268Z", "dateUpdated": "2021-02-24T21:23:54.9929698Z", "dateLastUpdateAttempted": "2021-02-24T21:23:54.9929698Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -21491,7 +21491,7 @@ "dateInstalled": "2021-02-12T20:47:22.2688873Z", "dateUpdated": "2021-02-25T06:06:59.4202741Z", "dateLastUpdateAttempted": "2021-02-25T06:06:59.4202741Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -22576,7 +22576,7 @@ "dateInstalled": "2021-01-24T23:41:09.6491074Z", "dateUpdated": "2021-02-24T21:23:54.7656034Z", "dateLastUpdateAttempted": "2021-02-24T21:23:54.7656034Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -23716,26 +23716,26 @@ "addonID": 422301, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3215196, - "displayName": "sophisticatedbackpacks-1.16.4-2.2.1.178.jar", - "fileName": "sophisticatedbackpacks-1.16.4-2.2.1.178.jar", - "fileDate": "2021-02-24T07:27:29.957Z", - "fileLength": 705121, + "id": 3217394, + "displayName": "sophisticatedbackpacks-1.16.4-2.2.1.183.jar", + "fileName": "sophisticatedbackpacks-1.16.4-2.2.1.183.jar", + "fileDate": "2021-02-26T00:25:36.28Z", + "fileLength": 704009, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3215/196/sophisticatedbackpacks-1.16.4-2.2.1.178.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3217/394/sophisticatedbackpacks-1.16.4-2.2.1.183.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [ { "id": 0, - "addonId": 238222, + "addonId": 309927, "type": 2, "fileId": 0 }, { "id": 0, - "addonId": 309927, + "addonId": 238222, "type": 2, "fileId": 0 } @@ -23744,13 +23744,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 558786155, + "fingerprint": 2869125676, "type": 0, "invalidFingerprint": false }, { "foldername": "net", - "fingerprint": 852426880, + "fingerprint": 4242045008, "type": 0, "invalidFingerprint": false }, @@ -23768,7 +23768,7 @@ }, { "foldername": "data", - "fingerprint": 2220313804, + "fingerprint": 2560982268, "type": 0, "invalidFingerprint": false }, @@ -23779,7 +23779,7 @@ "invalidFingerprint": false } ], - "packageFingerprint": 966894603, + "packageFingerprint": 2842703327, "gameVersion": [ "1.16.5", "1.16.4" @@ -23793,11 +23793,11 @@ "gameVersionDateReleased": "2020-11-02T18:40:51.49Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "sophisticatedbackpacks-1.16.4-2.2.1.178.jar" + "FileNameOnDisk": "sophisticatedbackpacks-1.16.4-2.2.1.183.jar" }, "dateInstalled": "2021-01-24T23:41:09.7837017Z", - "dateUpdated": "2021-02-24T21:23:52.0983433Z", - "dateLastUpdateAttempted": "2021-02-24T21:23:52.0983433Z", + "dateUpdated": "2021-02-26T18:44:06.4824651Z", + "dateLastUpdateAttempted": "2021-02-26T18:44:06.4824651Z", "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, @@ -25292,14 +25292,14 @@ "addonID": 60028, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3216633, - "displayName": "Aquaculture-1.16.5-2.1.16.jar", - "fileName": "Aquaculture-1.16.5-2.1.16.jar", - "fileDate": "2021-02-25T13:41:50.677Z", - "fileLength": 546660, + "id": 3202121, + "displayName": "Aquaculture-1.16.5-2.1.15.jar", + "fileName": "Aquaculture-1.16.5-2.1.15.jar", + "fileDate": "2021-02-13T01:40:17.297Z", + "fileLength": 546453, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3216/633/Aquaculture-1.16.5-2.1.16.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3202/121/Aquaculture-1.16.5-2.1.15.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -25307,13 +25307,13 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 2483215382, + "fingerprint": 3860940277, "type": 0, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 916084320, + "fingerprint": 1344058929, "type": 0, "invalidFingerprint": false }, @@ -25336,10 +25336,11 @@ "invalidFingerprint": false } ], - "packageFingerprint": 2725942653, + "packageFingerprint": 3726223298, "gameVersion": [ "1.16.5", - "Forge" + "Forge", + "1.16.4" ], "hasInstallScript": false, "isCompatibleWithClient": false, @@ -25350,12 +25351,12 @@ "gameVersionDateReleased": "2019-08-01T00:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "Aquaculture-1.16.5-2.1.16.jar" + "FileNameOnDisk": "Aquaculture-1.16.5-2.1.15.jar" }, - "dateInstalled": "2021-01-24T23:41:09.759766Z", - "dateUpdated": "2021-02-25T19:53:19.1154754Z", - "dateLastUpdateAttempted": "2021-02-25T19:53:19.1154754Z", - "status": 4, + "dateInstalled": "2021-02-25T19:54:35.9558841Z", + "dateUpdated": "2021-02-25T19:54:35.9648832Z", + "dateLastUpdateAttempted": "2021-02-25T19:54:35.9648832Z", + "status": 3, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -26316,14 +26317,14 @@ "addonID": 429235, "gameInstanceID": "b68b5dc4-7bd5-4e6f-834a-a24d23b7a5d0", "installedFile": { - "id": 3215757, - "displayName": "ferritecore-2.0.1-forge.jar", - "fileName": "ferritecore-2.0.1-forge.jar", - "fileDate": "2021-02-24T18:45:48.133Z", - "fileLength": 87612, + "id": 3218090, + "displayName": "ferritecore-2.0.2-forge.jar", + "fileName": "ferritecore-2.0.2-forge.jar", + "fileDate": "2021-02-26T16:29:42.467Z", + "fileLength": 87958, "releaseType": 1, "fileStatus": 4, - "downloadUrl": "https://edge.forgecdn.net/files/3215/757/ferritecore-2.0.1-forge.jar", + "downloadUrl": "https://edge.forgecdn.net/files/3218/90/ferritecore-2.0.2-forge.jar", "isAlternate": false, "alternateFileId": 0, "dependencies": [], @@ -26331,7 +26332,7 @@ "modules": [ { "foldername": "META-INF", - "fingerprint": 2421296927, + "fingerprint": 457294180, "type": 0, "invalidFingerprint": false }, @@ -26349,7 +26350,7 @@ }, { "foldername": "ferritecore.blockstatecache.mixin.json", - "fingerprint": 1020338111, + "fingerprint": 1727209124, "type": 0, "invalidFingerprint": false }, @@ -26373,7 +26374,7 @@ }, { "foldername": "ferritecore-common-refmap.json", - "fingerprint": 4073161422, + "fingerprint": 1443878361, "type": 0, "invalidFingerprint": false }, @@ -26385,18 +26386,18 @@ }, { "foldername": "malte0811", - "fingerprint": 1607865497, + "fingerprint": 3564352215, "type": 0, "invalidFingerprint": false }, { "foldername": "com", - "fingerprint": 4167066885, + "fingerprint": 2615150273, "type": 0, "invalidFingerprint": false } ], - "packageFingerprint": 280332066, + "packageFingerprint": 3022394379, "gameVersion": [ "1.16.5", "Forge" @@ -26410,12 +26411,12 @@ "gameVersionDateReleased": "2019-08-01T00:00:00Z", "gameId": 0, "isServerPack": false, - "FileNameOnDisk": "ferritecore-2.0.1-forge.jar" + "FileNameOnDisk": "ferritecore-2.0.2-forge.jar" }, - "dateInstalled": "2021-02-25T06:07:20.3318739Z", - "dateUpdated": "2021-02-25T06:07:20.3578675Z", - "dateLastUpdateAttempted": "2021-02-25T06:07:20.3578675Z", - "status": 3, + "dateInstalled": "2021-02-26T18:51:48.1917084Z", + "dateUpdated": "2021-02-26T18:51:48.2057494Z", + "dateLastUpdateAttempted": "2021-02-26T18:51:48.2057494Z", + "status": 4, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, @@ -26424,7 +26425,7 @@ "isFuzzyMatch": false, "preferenceReleaseType": null, "manifestName": null, - "installedTargets": null + "installedTargets": [] }, { "addonID": 377794, @@ -26877,7 +26878,7 @@ "dateInstalled": "2021-01-24T23:41:09.6739949Z", "dateUpdated": "2021-02-24T21:23:48.3788639Z", "dateLastUpdateAttempted": "2021-02-24T21:23:48.3788639Z", - "status": 4, + "status": 5, "preferenceAutoInstallUpdates": null, "preferenceAlternateFile": false, "preferenceIsIgnored": false, From 2610f35324f876dd096903e519cfaca3a5136f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Fri, 26 Feb 2021 20:31:53 +0100 Subject: [PATCH 35/35] buffed iron, copper and tin generation #1425 --- config/emendatusenigmatica-common.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/emendatusenigmatica-common.toml b/config/emendatusenigmatica-common.toml index c37ca4af5d..5f255e999c 100644 --- a/config/emendatusenigmatica-common.toml +++ b/config/emendatusenigmatica-common.toml @@ -94,7 +94,7 @@ overworld_base = 90 #Average Ores per Chunk [Default: 17] #Range: 0 ~ 64 - overworld_count = 20 + overworld_count = 28 #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 = [] @@ -484,7 +484,7 @@ overworld_base = 120 #Average Ores per Chunk [Default: 17] #Range: 0 ~ 64 - overworld_count = 20 + overworld_count = 25 #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 = [] @@ -495,7 +495,7 @@ overworld_spread = 80 #Configure the ore Vein Size [Default: 7] #Range: 0 ~ 64 - overworld_size = 7 + overworld_size = 8 #Activate/Deactivate the Ore Gen in The Overworld [Default: true] generate_in_the_overworld = true @@ -939,7 +939,7 @@ overworld_base = 80 #Average Ores per Chunk [Default: 15] #Range: 0 ~ 64 - overworld_count = 18 + overworld_count = 23 #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 = [] @@ -950,7 +950,7 @@ overworld_spread = 50 #Configure the ore Vein Size [Default: 7] #Range: 0 ~ 64 - overworld_size = 7 + overworld_size = 8 #Activate/Deactivate the Ore Gen in The Overworld [Default: true] generate_in_the_overworld = true