diff --git a/config/almostunified/debug.json b/config/almostunified/debug.json new file mode 100644 index 000000000..f163e52a6 --- /dev/null +++ b/config/almostunified/debug.json @@ -0,0 +1,7 @@ +{ + "dumpTagMap": false, + "dumpDuplicates": false, + "dumpUnification": false, + "dumpOverview": false, + "dumpRecipes": false +} \ No newline at end of file diff --git a/config/almostunified/duplicates.json b/config/almostunified/duplicates.json new file mode 100644 index 000000000..43613aa0d --- /dev/null +++ b/config/almostunified/duplicates.json @@ -0,0 +1,31 @@ +{ + "ignoredRecipeTypes": [ + "cucumber:shaped_tag" + ], + "ignoredRecipes": [], + "defaultDuplicateRules": { + "ignoredFields": [ + "conditions", + "group" + ], + "rules": { + "cookingtime": "HigherRule", + "energy": "HigherRule", + "experience": "HigherRule" + }, + "shouldSanitize": false + }, + "overrideDuplicateRules": { + "minecraft:crafting_shaped": { + "ignoredFields": [ + "pattern", + "conditions", + "key", + "group" + ], + "rules": {}, + "shouldSanitize": false + } + }, + "strictMode": false +} \ No newline at end of file diff --git a/config/almostunified/startup.json b/config/almostunified/startup.json new file mode 100644 index 000000000..448a42c41 --- /dev/null +++ b/config/almostunified/startup.json @@ -0,0 +1,3 @@ +{ + "serverOnly": false +} \ No newline at end of file diff --git a/config/almostunified/unify.json b/config/almostunified/unify.json new file mode 100644 index 000000000..15c8a2231 --- /dev/null +++ b/config/almostunified/unify.json @@ -0,0 +1,96 @@ +{ + "modPriorities": [ + "minecraft", + "kubejs", + "crafttweaker", + "create", + "thermal", + "immersiveengineering", + "mekanism" + ], + "stoneStrata": [ + "stone", + "nether", + "deepslate", + "granite", + "diorite", + "andesite" + ], + "tags": [ + "forge:nuggets/{material}", + "forge:dusts/{material}", + "forge:gears/{material}", + "forge:gems/{material}", + "forge:ingots/{material}", + "forge:raw_materials/{material}", + "forge:ores/{material}", + "forge:plates/{material}", + "forge:rods/{material}", + "forge:wires/{material}", + "forge:storage_blocks/{material}", + "forge:storage_blocks/raw_{material}" + ], + "materials": [ + "aeternium", + "aluminum", + "amber", + "apatite", + "bitumen", + "brass", + "bronze", + "charcoal", + "chrome", + "cinnabar", + "coal", + "coal_coke", + "cobalt", + "constantan", + "copper", + "diamond", + "electrum", + "elementium", + "emerald", + "enderium", + "fluorite", + "gold", + "graphite", + "invar", + "iridium", + "iron", + "lapis", + "lead", + "lumium", + "mithril", + "netherite", + "nickel", + "obsidian", + "osmium", + "peridot", + "platinum", + "potassium_nitrate", + "ruby", + "sapphire", + "signalum", + "silver", + "steel", + "sulfur", + "tin", + "tungsten", + "uranium", + "zinc" + ], + "priorityOverrides": {}, + "customTags": {}, + "tagOwnerships": {}, + "itemTagInheritanceMode": "ALLOW", + "itemTagInheritance": {}, + "blockTagInheritanceMode": "ALLOW", + "blockTagInheritance": {}, + "ignoredTags": [], + "ignoredItems": [], + "ignoredRecipeTypes": [ + "cucumber:shaped_tag" + ], + "ignoredRecipes": [], + "itemsHidingJeiRei": true +} \ No newline at end of file diff --git a/config/fancymenu/config.txt b/config/fancymenu/config.txt index 049e61edf..23f44c3b1 100644 --- a/config/fancymenu/config.txt +++ b/config/fancymenu/config.txt @@ -17,7 +17,7 @@ I:defaultguiscale = '-1'; ##[customization] B:advancedmode = 'false'; -B:showcustomizationbuttons = 'true'; +B:showcustomizationbuttons = 'false'; ##[loading] diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_1.png b/config/fancymenu/slideshows/tfgslideshow/images/image_1.png index 7fe6fadf3..6717daa9c 100644 Binary files a/config/fancymenu/slideshows/tfgslideshow/images/image_1.png and b/config/fancymenu/slideshows/tfgslideshow/images/image_1.png differ diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_10.png b/config/fancymenu/slideshows/tfgslideshow/images/image_10.png new file mode 100644 index 000000000..642ce4716 Binary files /dev/null and b/config/fancymenu/slideshows/tfgslideshow/images/image_10.png differ diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_2.png b/config/fancymenu/slideshows/tfgslideshow/images/image_2.png index c892b709a..c4afff164 100644 Binary files a/config/fancymenu/slideshows/tfgslideshow/images/image_2.png and b/config/fancymenu/slideshows/tfgslideshow/images/image_2.png differ diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_3.png b/config/fancymenu/slideshows/tfgslideshow/images/image_3.png new file mode 100644 index 000000000..08b525ee5 Binary files /dev/null and b/config/fancymenu/slideshows/tfgslideshow/images/image_3.png differ diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_4.png b/config/fancymenu/slideshows/tfgslideshow/images/image_4.png new file mode 100644 index 000000000..674dc4cb4 Binary files /dev/null and b/config/fancymenu/slideshows/tfgslideshow/images/image_4.png differ diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_5.png b/config/fancymenu/slideshows/tfgslideshow/images/image_5.png new file mode 100644 index 000000000..42b67c812 Binary files /dev/null and b/config/fancymenu/slideshows/tfgslideshow/images/image_5.png differ diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_6.png b/config/fancymenu/slideshows/tfgslideshow/images/image_6.png new file mode 100644 index 000000000..1fddb99d1 Binary files /dev/null and b/config/fancymenu/slideshows/tfgslideshow/images/image_6.png differ diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_7.png b/config/fancymenu/slideshows/tfgslideshow/images/image_7.png new file mode 100644 index 000000000..f7203c17d Binary files /dev/null and b/config/fancymenu/slideshows/tfgslideshow/images/image_7.png differ diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_8.png b/config/fancymenu/slideshows/tfgslideshow/images/image_8.png new file mode 100644 index 000000000..9180fce78 Binary files /dev/null and b/config/fancymenu/slideshows/tfgslideshow/images/image_8.png differ diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_9.png b/config/fancymenu/slideshows/tfgslideshow/images/image_9.png new file mode 100644 index 000000000..66ed7d95b Binary files /dev/null and b/config/fancymenu/slideshows/tfgslideshow/images/image_9.png differ diff --git a/config/oculus.properties b/config/oculus.properties index 5502043e1..91d5c74d9 100644 --- a/config/oculus.properties +++ b/config/oculus.properties @@ -1,5 +1,5 @@ #This file stores configuration options for Iris, such as the currently active shaderpack -#Mon Nov 06 18:12:57 NOVT 2023 +#Mon Nov 06 20:06:52 NOVT 2023 colorSpace=SRGB disableUpdateMessage=false enableDebugOptions=false diff --git a/config/roughlyenoughitems/pinyin.properties b/config/roughlyenoughitems/pinyin.properties index eb7117fbd..a01fb688d 100644 --- a/config/roughlyenoughitems/pinyin.properties +++ b/config/roughlyenoughitems/pinyin.properties @@ -1,2 +1,2 @@ #Pinyin Options -#Mon Nov 06 18:10:10 NOVT 2023 +#Mon Nov 06 20:09:45 NOVT 2023 diff --git a/config/roughlyenoughitems/pinyin_double.properties b/config/roughlyenoughitems/pinyin_double.properties index 92551c190..88759a256 100644 --- a/config/roughlyenoughitems/pinyin_double.properties +++ b/config/roughlyenoughitems/pinyin_double.properties @@ -1,3 +1,3 @@ #Double Pinyin Options -#Mon Nov 06 18:10:10 NOVT 2023 +#Mon Nov 06 20:09:45 NOVT 2023 Converter=sougou diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index 485d87e8f..c2360d359 100644 --- a/config/xaerominimap_entities.json +++ b/config/xaerominimap_entities.json @@ -10,8 +10,8 @@ "name": "gui.xaero_entity_category_root", "protection": true, "settingOverrides": { - "displayed": true, "displayHeight": 0.0, + "displayed": true, "heightBasedFade": true, "renderOrder": 0.0, "color": 13.0, diff --git a/mods/almostunified-forge-1.20.1-0.7.0.jar_disabled b/mods/almostunified-forge-1.20.1-0.7.0.jar similarity index 100% rename from mods/almostunified-forge-1.20.1-0.7.0.jar_disabled rename to mods/almostunified-forge-1.20.1-0.7.0.jar diff --git a/mods/terrafirmagreg-0.0.1.jar b/mods/terrafirmagreg-0.0.1.jar index b3b583a02..a946608b0 100644 Binary files a/mods/terrafirmagreg-0.0.1.jar and b/mods/terrafirmagreg-0.0.1.jar differ diff --git a/shaderpacks/ComplementaryReimagined_r5.0.1.zip b/shaderpacks/ComplementaryReimagined_r5.0.1.zip index 940433d5f..144fef4b3 100644 Binary files a/shaderpacks/ComplementaryReimagined_r5.0.1.zip and b/shaderpacks/ComplementaryReimagined_r5.0.1.zip differ