-
-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3190 from AllTheMods/Staging
Release 1.9.0
- Loading branch information
Showing
35 changed files
with
14,578 additions
and
2,132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # Default to LF for all files | ||
| * text=auto eol=lf | ||
|
|
||
| # Batch files should use CRLF | ||
| *.bat text eol=crlf | ||
|
|
||
| # Disable autocrlf on generated files, they always generate with LF | ||
| # Add any extra files or paths here to make git stop saying they | ||
| # are changed when only line endings change. | ||
| src/generated/**/.cache/cache text eol=lf | ||
| src/generated/**/*.json text eol=lf | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| ### Mod Additions | ||
| - AEInfinityBooster-1.16.5-1.0.0+12.jar | ||
| - embeddium-0.2.7+mc1.16.5.jar | ||
| - modernfix-forge-5.9.2+mc1.16.5.jar | ||
| - oculus-mc1.16.5-1.4.6.jar | ||
| - ProjectIntelligence-1.16.5-1.1.0.35-universal.jar | ||
| - RoadRunner-mc1.16.5-1.4.1.jar | ||
| - starlight-1.2.jar | ||
| ### Mod Updates | ||
| - AdChimneys-1.16.5-6.1.0.0-build.0330.jar | ||
| - Apotheosis-1.16.5-4.8.9A0.jar | ||
| - appleskin-forge-mc1.16.x-2.5.1.jar | ||
| - Aquaculture-1.16.5-2.1.23.jar | ||
| - ars_nouveau-1.16.5-1.25.10.jar | ||
| - Bookshelf-Forge-1.16.5-10.4.33.jar | ||
| - Botania-1.16.5-420.3.jar | ||
| - BotanyPots-1.16.5-7.1.41.jar | ||
| - BotanyTrees-1.16.5-3.0.12.jar | ||
| - buildinggadgets-1.16.5-3.8.4-build.25+mc1.16.5.jar | ||
| - byg-1.3.6.jar | ||
| - cc-tweaked-1.16.5-1.101.3.jar | ||
| - cloth-config-4.17.101-forge.jar | ||
| - cofh_core-1.16.5-1.5.2.22.jar | ||
| - collective-1.16.5-5.49.jar | ||
| - configurableextramobdrops_1.16.5-2.5.jar | ||
| - configured-1.5.4-1.16.5.jar | ||
| - Controlling-7.0.0.29.jar | ||
| - curios-forge-1.16.5-4.1.0.0.jar | ||
| - Cyclic-1.16.5-1.5.20.jar | ||
| - Draconic-Evolution-1.16.5-3.0.29.518-universal.jar | ||
| - dummmmmmy-1.16.5-1.3.3.jar | ||
| - DungeonCrawl-1.16.5-2.3.12.jar | ||
| - EnchantmentDescriptions-1.16.5-7.1.23.jar | ||
| - entangled-1.3.16-forge-mc1.16.jar | ||
| - entityculling-forge-mc1.16.5-1.5.2.jar | ||
| - EquipmentCompare-1.16.5-1.3.2.jar | ||
| - Exchangers-1.16.5-3.2.1.jar | ||
| - FastWorkbench-1.16.5-4.6.2.jar | ||
| - ferritecore-2.1.1-forge.jar | ||
| - ForgeEndertech-1.16.5-7.3.0.0-build.0330.jar | ||
| - FramedBlocks-2.16.3.jar | ||
| - ftb-chunks-forge-1605.3.4-build.220.jar | ||
| - ftb-quests-forge-1605.3.7-build.165.jar | ||
| - geckolib-forge-1.16.5-3.0.106.jar | ||
| - GunpowderLib-1.16.5-1.2.3.jar | ||
| - Iceberg-1.16.5-1.0.45.jar | ||
| - ImmersivePetroleum-1.16.5-3.4.0-20.jar | ||
| - IntegratedCrafting-1.16.5-1.0.23.jar | ||
| - IntegratedDynamics-1.16.5-1.10.15.jar | ||
| - IntegratedTunnels-1.16.5-1.8.11.jar | ||
| - jei-1.16.5-7.8.0.1009.jar | ||
| - JustEnoughCalculation-1.16.5-3.9.2.jar | ||
| - JustEnoughResources-1.16.5-0.12.2.216.jar | ||
| - lazierae2-1.16.5-2.0.5.jar | ||
| - lootr-1.16.5-0.2.18.49.jar | ||
| - lostcities-1.16-4.0.12-beta.jar | ||
| - mahoutsukai-1.16.5-v1.34.57.jar | ||
| - mcw-bridges-2.1.0-mc1.16.5forge.jar | ||
| - mcw-doors-1.1.0forge-mc1.16.5.jar | ||
| - mcw-fences-1.0.7-mc1.16.5forge.jar | ||
| - mcw-roofs-2.2.4-mc1.16.5forge.jar | ||
| - mcw-trapdoors-1.1.2-mc1.16.5forge.jar | ||
| - mcw-windows-2.2.0-mc1.16.5forge.jar | ||
| - metalbarrels-1.16.5-3.4a.jar | ||
| - minecolonies-1.16.5-1.0.978-RELEASE.jar | ||
| - mob_grinding_utils-1.16.5-0.4.47.jar | ||
| - modular-routers-1.16.5-7.5.46.jar | ||
| - moreminecarts-1.3.19.jar | ||
| - pamhc2foodextended-1.16.3-1.0.5.jar | ||
| - pamhc2trees-1.16.3-1.0.2.jar | ||
| - pedestals-0.8u.jar | ||
| - Placebo-1.16.5-4.7.1.jar | ||
| - pneumaticcraft-repressurized-1.16.5-2.15.12-13.jar | ||
| - ProjectRed-1.16.5-4.15.0-core.jar | ||
| - ProjectRed-1.16.5-4.15.0-exploration.jar | ||
| - ProjectRed-1.16.5-4.15.0-illumination.jar | ||
| - ProjectRed-1.16.5-4.15.0-integration.jar | ||
| - ProjectRed-1.16.5-4.15.0-transmission.jar | ||
| - Psi-1.16-97.474.jar | ||
| - refinedstorage-1.9.18.jar | ||
| - rsgauges-1.16.5-1.2.17.jar | ||
| - simplemagnets-1.1.10-forge-mc1.16.jar | ||
| - sophisticatedbackpacks-1.16.5-3.15.20.755.jar | ||
| - starterkit_1.16.5-4.1.jar | ||
| - structurize-1.16.5-1.0.418-ALPHA.jar | ||
| - supermartijn642configlib-1.1.8-forge-mc1.16.jar | ||
| - supermartijn642corelib-1.1.15-forge-mc1.16.jar | ||
| - supplementaries-1.16.5-0.18.7.jar | ||
| - TerraForged-1.16.5-0.2.16.jar | ||
| - thermal_expansion-1.16.5-1.5.2.16.jar | ||
| - thermal_foundation-1.16.5-1.5.2.30.jar | ||
| - tinyredstone-1.16.5-1.13.9.jar | ||
| - titanium-1.16.5-3.2.8.8-24.jar | ||
| - ToolBelt-1.16.5-1.16.3.jar | ||
| - trashcans-1.0.18-forge-mc1.16.jar | ||
| - woot-1.16.5-1.0.8.4.jar | ||
|
|
||
| ### Other Changes | ||
| - Added Embeddium and Oculus for shaderpack support | ||
| - Remove uncrafting tables from structure loot (#3175) | ||
| - Add tag support to silicon press recipe (#3141) | ||
| - Remove Quark sugar cane bundle recipe (#3142) | ||
| - Add Mekanism quest line (thanks to ToshibaEC0Microwave) | ||
| - Add Blood Magic quest line (thanks to Laithur) | ||
| - General quest overhaul |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,23 @@ | ||
| "General Settings" { | ||
| B:"Unbreakable Screwdriver"=true | ||
| # General settings | ||
| "general" { | ||
| # If set to true, the basic screwdriver will not take damage | ||
| B:"infinite_screwdriver"=true | ||
| } | ||
| "Machine Settings" { | ||
| B:"Enable the Diamond Block Breaker"=true | ||
|
|
||
| # Settings related to machines and devices | ||
| "machines" { | ||
| # Allow the Diamond Block Breaker to be crafted | ||
| B:"diamond_block_breaker"=true | ||
| } | ||
| "World Gen" { | ||
| B:"Marble Caves"=false | ||
| B:"Copper Ore"=false | ||
| B:"Tin Ore"=false | ||
| B:"Silver Ore"=false | ||
|
|
||
| # World gen settings | ||
| "world_gen" { | ||
| # Enable Copper Ore generation | ||
| B:"copper_ore"=false | ||
| # Enable Tin Ore generation | ||
| B:"tin_ore"=false | ||
| # Enable Silver Ore generation | ||
| B:"silver_ore"=false | ||
| # Enable Marble Cave generation | ||
| B:"marble_cave"=false | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| [client] | ||
| [client.visual_options] | ||
| tasks = false | ||
| [client.duration_options] | ||
| goal_effect_fadein = 0.2 | ||
| goal_effect_fadeout = 0.5 | ||
| goal_duration = 2.0 | ||
| challenge_effect_fadein = 0.2 | ||
| challenge_effect_fadeout = 0.5 | ||
| challenge_duration = 2.0 | ||
| [client] | ||
| [client.visual_options] | ||
| tasks = false | ||
| [client.duration_options] | ||
| goal_effect_fadein = 0.2 | ||
| goal_effect_fadeout = 0.5 | ||
| goal_duration = 2.0 | ||
| challenge_effect_fadein = 0.2 | ||
| challenge_effect_fadeout = 0.5 | ||
| challenge_duration = 2.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,6 @@ | |
| [packversionmaj] | ||
| major = 1 | ||
| [packversionmin] | ||
| minor = 8 | ||
| minor = 9 | ||
| [packversionminrev] | ||
| minorrev = 28 | ||
| minorrev = 0 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,11 @@ | ||
| { | ||
| chapter_groups: [ | ||
| { id: "1AC60211DE7427FC", title: "Logistics" } | ||
| { id: "6614EE2378B8AFB9", title: "Resources" } | ||
| { id: "2B51AC12041E3F89", title: "Tech" } | ||
| { id: "06B954267315CB8E", title: "Main Questline" } | ||
| { id: "6F2FD2AFD7A0F137", title: "Tools and Armor" } | ||
| { id: "1AC60211DE7427FC", title: "Storage" } | ||
| { id: "6614EE2378B8AFB9", title: "Resource Generation" } | ||
| { id: "2B51AC12041E3F89", title: "Tech and Science" } | ||
| { id: "02FE661031A105D8", title: "Magic" } | ||
| { id: "4742E6B32DF6698E", title: "Exploration" } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.