diff --git a/config/betterthirdperson-common.toml b/config/betterthirdperson-common.toml new file mode 100644 index 000000000..9d1781f80 --- /dev/null +++ b/config/betterthirdperson-common.toml @@ -0,0 +1,19 @@ +#Align player to camera on left & right clicks +aimPlayerOnInteract = true +#How long player will be aligned to camera after left & right clicks +#Range: 10 ~ 200 +aimDuration = 40 +#Angle in degrees within the player will slightly follow camera yaw (while standing still) +#Range: 0 ~ 90 +followYaw = 45 +#Does camera should rotate freely during elytra flight +freeCameraDuringElytraFlight = false +#Completely remove third-person front view +skipThirdPersonFrontView = false +#How fast player changes movement direction in third-person +#Range: 10 ~ 100 +playerRotationSpeed = 50 +#How fast player pitch follows camera pitch in third-person +#Range: 10 ~ 100 +pitchChangeSpeed = 65 + diff --git a/config/cucumber-client.toml b/config/cucumber-client.toml new file mode 100644 index 000000000..ee9484a1d --- /dev/null +++ b/config/cucumber-client.toml @@ -0,0 +1,8 @@ + +#General configuration options. +[General] + #Enable tag list tooltips for blocks/items? + tagTooltips = true + #Enable NBT tooltips for items? + nbtTooltips = false + diff --git a/config/cucumber-common.toml b/config/cucumber-common.toml new file mode 100644 index 000000000..5a6e258d7 --- /dev/null +++ b/config/cucumber-common.toml @@ -0,0 +1,8 @@ + +#General configuration options. +[General] + #Mod ids (in order) to prioritize using items for when generating the cucumber-tags.json file. + modTagPriorities = ["thermal", "mekanism", "tconstruct", "immersiveengineering", "appliedenergistics2"] + #If enabled, any tags in the cucumber-tags.json file set to items that don't exist will be refreshed if possible. + autoRefreshTagOptions = true + diff --git a/config/extendedcrafting-client.toml b/config/extendedcrafting-client.toml new file mode 100644 index 000000000..62a78ad88 --- /dev/null +++ b/config/extendedcrafting-client.toml @@ -0,0 +1,6 @@ + +#Client settings. +[General] + #Should the Quantum Compressor render the result item above it? + enableCompressorRenderer = true + diff --git a/config/extendedcrafting-common.toml b/config/extendedcrafting-common.toml new file mode 100644 index 000000000..c2f29c31b --- /dev/null +++ b/config/extendedcrafting-common.toml @@ -0,0 +1,110 @@ + +#Settings for Singularities. +[Singularities] + #Should the default recipe for the Ultimate Singularity be generated? + ultimateSingularityRecipe = true + #The default amount of items required to create a Singularity. + #Range: > 1 + defaultMaterialsRequired = 10000 + #Should default recipes be generated for Singularities? + defaultRecipes = true + #The default amount of FE required to create a Singularity. + #Range: > 0 + defaultPowerRequired = 5000000 + #Should the Singularities be enabled? + enabled = true + #The item to use as the Catalyst in default Singularity recipes. + defaultCatalyst = "extendedcrafting:ultimate_catalyst" + +#Settings for the Crafting Core. +["Combination Crafting"] + #How much FE the Crafting Core should hold. + #Range: > 0 + powerCapacity = 5000000 + #How much FE/t the Crafting Core should use when crafting by default. + #Range: > 0 + powerRate = 500 + #Should the Crafting Core be enabled? + enabled = true + +#Settings for general things. +[General] + #Should the Handheld Crafting Table be enabled? + handheldWorkbench = true + +#Settings for the Extended Crafting Tables. +["Table Crafting"] + #How much FE the Auto Crafting Tables should hold. Higher tiers use double the previous tier. + #Range: > 0 + autoTablePowerCapacity = 500000 + #How much FE the Auto Crafting Tables should use when auto inserting items. + #Range: > 0 + autoTableInsertPowerRate = 100 + #Should the Basic Crafting Table inherit vanilla crafting recipes? + useVanillaRecipes = true + #Should the Extended Crafting Tables be enabled? + enabled = true + #Should the Auto Crafting Tables be enabled? + autoTablesEnabled = true + #How much FE the Auto Crafting Tables should use when crafting. + #Range: > 0 + autoTablePowerRate = 500 + +#Settings for the Quantum Compressor. +["Quantum Compression"] + #How much FE the Quantum Compressor should hold. + #Range: > 0 + powerCapacity = 10000000 + #How much FE/t the Quantum Compressor should use when crafting by default. + #Range: > 0 + powerRate = 5000 + #Should the Quantum Compressor be enabled? + enabled = true + +#Settings for the Recipe Maker. +["Recipe Maker"] + #Should the recipe maker add NBT tags when possible? + useNBT = true + #Should the recipe maker try to use tags when possible? + useTags = false + #Should the Recipe Maker be enabled? + enabled = true + +#Settings for the Flux Crafter. +["Flux Crafting"] + #How much FE/t the Flux Crafter should pull from each Flux Alternator when crafting by default. + #Range: > 0 + defaultPowerRate = 400 + #How much FE the Flux Alternator should hold. + #Range: > 0 + powerCapacity = 80000 + #How much FE the Auto Flux Crafter should hold. + #Range: > 0 + autoCrafterPowerCapacity = 500000 + #How much FE the Auto Flux Crafter should use when auto inserting items. + #Range: > 0 + autoCrafterInsertPowerRate = 100 + #Should the Flux Crafter be enabled? + enabled = true + #Should the Auto Flux Crafter be enabled? + autoCrafterEnabled = true + +#Settings for the Ender Crafter. +["Ender Crafting"] + #How long a single Ender Crafter crafting operation should take (in seconds) by default. + #Range: > 1 + defaultTimeRequired = 60 + #How much FE the Auto Ender Crafter should hold. + #Range: > 0 + autoCrafterPowerCapacity = 500000 + #How much FE the Auto Ender Crafter should use when auto inserting items. + #Range: > 0 + autoCrafterInsertPowerRate = 100 + #How much a single Ender Alternator should speed up a craft. This is a percentage of the time required. + #Range: 0.0 ~ 1.0 + alternatorEffectiveness = 0.01 + #Should the Ender Crafter be enabled? + enabled = true + #Should the Auto Ender Crafter be enabled? + autoCrafterEnabled = true + diff --git a/config/extendedcrafting/singularities/aluminum.json b/config/extendedcrafting/singularities/aluminum.json new file mode 100644 index 000000000..724106e71 --- /dev/null +++ b/config/extendedcrafting/singularities/aluminum.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.aluminum", + "colors": [ + "caccda", + "9a9ca6" + ], + "ingredient": { + "tag": "forge:ingots/aluminum" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/bronze.json b/config/extendedcrafting/singularities/bronze.json new file mode 100644 index 000000000..59f450a64 --- /dev/null +++ b/config/extendedcrafting/singularities/bronze.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.bronze", + "colors": [ + "d99f43", + "bb6b3b" + ], + "ingredient": { + "tag": "forge:ingots/bronze" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/coal.json b/config/extendedcrafting/singularities/coal.json new file mode 100644 index 000000000..c14c35360 --- /dev/null +++ b/config/extendedcrafting/singularities/coal.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.coal", + "colors": [ + "363739", + "261e24" + ], + "ingredient": { + "item": "minecraft:coal" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/copper.json b/config/extendedcrafting/singularities/copper.json new file mode 100644 index 000000000..1964f5b02 --- /dev/null +++ b/config/extendedcrafting/singularities/copper.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.copper", + "colors": [ + "fa977c", + "bc5430" + ], + "ingredient": { + "item": "minecraft:copper_ingot" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/diamond.json b/config/extendedcrafting/singularities/diamond.json new file mode 100644 index 000000000..7bc166400 --- /dev/null +++ b/config/extendedcrafting/singularities/diamond.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.diamond", + "colors": [ + "a6fce9", + "1aaca8" + ], + "ingredient": { + "item": "minecraft:diamond" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/electrum.json b/config/extendedcrafting/singularities/electrum.json new file mode 100644 index 000000000..209851a82 --- /dev/null +++ b/config/extendedcrafting/singularities/electrum.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.electrum", + "colors": [ + "f5f18e", + "9e8d3e" + ], + "ingredient": { + "tag": "forge:ingots/electrum" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/emerald.json b/config/extendedcrafting/singularities/emerald.json new file mode 100644 index 000000000..03742576f --- /dev/null +++ b/config/extendedcrafting/singularities/emerald.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.emerald", + "colors": [ + "7df8ac", + "8e1a" + ], + "ingredient": { + "item": "minecraft:emerald" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/glowstone.json b/config/extendedcrafting/singularities/glowstone.json new file mode 100644 index 000000000..0d9355cf5 --- /dev/null +++ b/config/extendedcrafting/singularities/glowstone.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.glowstone", + "colors": [ + "ffd38f", + "a06135" + ], + "ingredient": { + "item": "minecraft:glowstone_dust" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/gold.json b/config/extendedcrafting/singularities/gold.json new file mode 100644 index 000000000..702531b83 --- /dev/null +++ b/config/extendedcrafting/singularities/gold.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.gold", + "colors": [ + "fdf55f", + "d98e04" + ], + "ingredient": { + "item": "minecraft:gold_ingot" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/invar.json b/config/extendedcrafting/singularities/invar.json new file mode 100644 index 000000000..961cddb35 --- /dev/null +++ b/config/extendedcrafting/singularities/invar.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.invar", + "colors": [ + "bcc5bb", + "5d7877" + ], + "ingredient": { + "tag": "forge:ingots/invar" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/iron.json b/config/extendedcrafting/singularities/iron.json new file mode 100644 index 000000000..555308d92 --- /dev/null +++ b/config/extendedcrafting/singularities/iron.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.iron", + "colors": [ + "e1e1e1", + "6c6c6c" + ], + "ingredient": { + "item": "minecraft:iron_ingot" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/lapis_lazuli.json b/config/extendedcrafting/singularities/lapis_lazuli.json new file mode 100644 index 000000000..debc6c58e --- /dev/null +++ b/config/extendedcrafting/singularities/lapis_lazuli.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.lapis_lazuli", + "colors": [ + "678dea", + "1b53a7" + ], + "ingredient": { + "item": "minecraft:lapis_lazuli" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/lead.json b/config/extendedcrafting/singularities/lead.json new file mode 100644 index 000000000..2a2e492ed --- /dev/null +++ b/config/extendedcrafting/singularities/lead.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.lead", + "colors": [ + "6c7d92", + "323562" + ], + "ingredient": { + "tag": "forge:ingots/lead" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/nickel.json b/config/extendedcrafting/singularities/nickel.json new file mode 100644 index 000000000..8598cdbb3 --- /dev/null +++ b/config/extendedcrafting/singularities/nickel.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.nickel", + "colors": [ + "e1d798", + "b1976c" + ], + "ingredient": { + "tag": "forge:ingots/nickel" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/platinum.json b/config/extendedcrafting/singularities/platinum.json new file mode 100644 index 000000000..6d23715e7 --- /dev/null +++ b/config/extendedcrafting/singularities/platinum.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.platinum", + "colors": [ + "6feaef", + "57b8bc" + ], + "ingredient": { + "tag": "forge:ingots/platinum" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/redstone.json b/config/extendedcrafting/singularities/redstone.json new file mode 100644 index 000000000..25299f4cb --- /dev/null +++ b/config/extendedcrafting/singularities/redstone.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.redstone", + "colors": [ + "ff0000", + "8a0901" + ], + "ingredient": { + "item": "minecraft:redstone" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/silver.json b/config/extendedcrafting/singularities/silver.json new file mode 100644 index 000000000..fbf770f22 --- /dev/null +++ b/config/extendedcrafting/singularities/silver.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.silver", + "colors": [ + "c0cdd2", + "5f6e7c" + ], + "ingredient": { + "tag": "forge:ingots/silver" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/steel.json b/config/extendedcrafting/singularities/steel.json new file mode 100644 index 000000000..f59c84fe5 --- /dev/null +++ b/config/extendedcrafting/singularities/steel.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.steel", + "colors": [ + "565656", + "232323" + ], + "ingredient": { + "tag": "forge:ingots/steel" + } +} \ No newline at end of file diff --git a/config/extendedcrafting/singularities/tin.json b/config/extendedcrafting/singularities/tin.json new file mode 100644 index 000000000..153bacc19 --- /dev/null +++ b/config/extendedcrafting/singularities/tin.json @@ -0,0 +1,10 @@ +{ + "name": "singularity.extendedcrafting.tin", + "colors": [ + "a0bebd", + "527889" + ], + "ingredient": { + "tag": "forge:ingots/tin" + } +} \ No newline at end of file diff --git a/config/jade/plugins.json b/config/jade/plugins.json index ee3ae5a89..a28200be8 100644 --- a/config/jade/plugins.json +++ b/config/jade/plugins.json @@ -1,4 +1,19 @@ { + "extendedcrafting": { + "elite_auto_table": true, + "ender_crafter": true, + "basic_auto_table": true, + "flux_crafter": true, + "advanced_table": true, + "auto_ender_crafter": true, + "ultimate_table": true, + "ultimate_auto_table": true, + "elite_table": true, + "basic_table": true, + "crafting_core": true, + "advanced_auto_table": true, + "compressor": true + }, "minecraft": { "item_storage.show_name_amount": 5, "furnace": true, diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index babecfe8f..ebbf37c16 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -108,6 +108,33 @@ "create:exact_block": null, "create:filter": null, "create:goggles": null, + "create:backtank_capacity": null, + "extendedcrafting:crafting_core": null, + "extendedcrafting:basic_table": null, + "extendedcrafting:advanced_table": null, + "extendedcrafting:elite_table": null, + "extendedcrafting:ultimate_table": null, + "extendedcrafting:basic_auto_table": null, + "extendedcrafting:advanced_auto_table": null, + "extendedcrafting:elite_auto_table": null, + "extendedcrafting:ultimate_auto_table": null, + "extendedcrafting:ender_crafter": null, + "extendedcrafting:auto_ender_crafter": null, + "extendedcrafting:flux_crafter": null, + "extendedcrafting:compressor": null, + "extendedcrafting:crafting_core": null, + "extendedcrafting:basic_table": null, + "extendedcrafting:advanced_table": null, + "extendedcrafting:elite_table": null, + "extendedcrafting:ultimate_table": null, + "extendedcrafting:basic_auto_table": null, + "extendedcrafting:advanced_auto_table": null, + "extendedcrafting:elite_auto_table": null, + "extendedcrafting:ultimate_auto_table": null, + "extendedcrafting:ender_crafter": null, + "extendedcrafting:auto_ender_crafter": null, + "extendedcrafting:flux_crafter": null, + "extendedcrafting:compressor": null, "gtceu:electric_container_provider": null, "gtceu:workable_provider": null, "gtceu:controllable_provider": null, diff --git a/config/oculus.properties b/config/oculus.properties index 91d5c74d9..459028083 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 20:06:52 NOVT 2023 +#Sat Nov 11 14:48:32 NOVT 2023 colorSpace=SRGB disableUpdateMessage=false enableDebugOptions=false diff --git a/config/roughlyenoughitems/config.json5 b/config/roughlyenoughitems/config.json5 index 637e54fbd..7103e03ce 100644 --- a/config/roughlyenoughitems/config.json5 +++ b/config/roughlyenoughitems/config.json5 @@ -60,8 +60,7 @@ "shouldFilterDisplays": true, "filteringRules": [ "{id:\"roughlyenoughitems:manual\",rule:{}}", - "{id:\"roughlyenoughitems:basic\",rule:{}}", - "{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}" + "{id:\"roughlyenoughitems:basic\",rule:{}}" ], "filteringQuickCraftCategories": { }, "filteredStacks": [] diff --git a/config/roughlyenoughitems/pinyin.properties b/config/roughlyenoughitems/pinyin.properties index a01fb688d..d23f99c36 100644 --- a/config/roughlyenoughitems/pinyin.properties +++ b/config/roughlyenoughitems/pinyin.properties @@ -1,2 +1,2 @@ #Pinyin Options -#Mon Nov 06 20:09:45 NOVT 2023 +#Fri Nov 10 23:25:20 NOVT 2023 diff --git a/config/roughlyenoughitems/pinyin_double.properties b/config/roughlyenoughitems/pinyin_double.properties index 88759a256..dd2986b75 100644 --- a/config/roughlyenoughitems/pinyin_double.properties +++ b/config/roughlyenoughitems/pinyin_double.properties @@ -1,3 +1,3 @@ #Double Pinyin Options -#Mon Nov 06 20:09:45 NOVT 2023 +#Fri Nov 10 23:25:20 NOVT 2023 Converter=sougou diff --git a/config/xaerominimap.txt b/config/xaerominimap.txt index 3c0824f7a..da3de6b1d 100644 --- a/config/xaerominimap.txt +++ b/config/xaerominimap.txt @@ -13,7 +13,7 @@ minimap:true caveMaps:2 caveZoom:1 showWaypoints:true -showIngameWaypoints:true +showIngameWaypoints:false displayRedstone:true deathpoints:true oldDeathpoints:true diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index c2360d359..485d87e8f 100644 --- a/config/xaerominimap_entities.json +++ b/config/xaerominimap_entities.json @@ -10,8 +10,8 @@ "name": "gui.xaero_entity_category_root", "protection": true, "settingOverrides": { - "displayHeight": 0.0, "displayed": true, + "displayHeight": 0.0, "heightBasedFade": true, "renderOrder": 0.0, "color": 13.0, diff --git a/config/xaeroworldmap.txt b/config/xaeroworldmap.txt index 574155da9..e6022a0e2 100644 --- a/config/xaeroworldmap.txt +++ b/config/xaeroworldmap.txt @@ -5,7 +5,7 @@ differentiateByServerAddress:true caveMapsAllowed:true debug:false lighting:true -colours:0 +colours:1 loadChunks:true updateChunks:true terrainSlopes:2 diff --git a/mods/BetterThirdPerson-Forge-1.20-1.9.0.jar b/mods/BetterThirdPerson-Forge-1.20-1.9.0.jar new file mode 100644 index 000000000..44a88da44 Binary files /dev/null and b/mods/BetterThirdPerson-Forge-1.20-1.9.0.jar differ diff --git a/mods/Cucumber-1.20.1-7.0.4.jar b/mods/Cucumber-1.20.1-7.0.4.jar new file mode 100644 index 000000000..ba783af8d Binary files /dev/null and b/mods/Cucumber-1.20.1-7.0.4.jar differ diff --git a/mods/ExtendedCrafting-1.20.1-6.0.4.jar b/mods/ExtendedCrafting-1.20.1-6.0.4.jar new file mode 100644 index 000000000..4b964919c Binary files /dev/null and b/mods/ExtendedCrafting-1.20.1-6.0.4.jar differ diff --git a/mods/terrafirmagreg-0.0.1.jar b/mods/terrafirmagreg-0.0.1.jar index db503f045..29ce53da4 100644 Binary files a/mods/terrafirmagreg-0.0.1.jar and b/mods/terrafirmagreg-0.0.1.jar differ