Nebby/quest tokens

.github/CONTRIBUTING.md

@@ -35,11 +35,17 @@ You can do that using **terminal**, **cmd** or the **GitHub Desktop** app.
 
 ### 5
 
+If you've installed Pakku utilizing Scoop/Brew:
 - Open your _terminal_ and run:
     ```
     pakku fetch
     ```
 
+Otherwise, if you downloaded the raw .jar
+- Open your _terminal_ and run:
+    ```
+    java -jar pakku.jar fetch
+    ```
 <!-- Links: -->
 [PrismLauncher]: https://prismlauncher.org/
 [Visual Studio Code]: https://code.visualstudio.com/

.github/LOCALIZATION_CONTRIBUTING.md

@@ -0,0 +1,43 @@
+# Localization Contributions to TerraFirmaGreg-Modern
+
+To contribute to Localization you'll need to know how to Contribute in general, please go to [CONTRIBUTING](CONTRIBUTING.md)
+
+Language files located under ``minecraft/kubejs/assets/MOD_ID/lang`` cannot be modified, if you modify these files you WILL loose your contributions when the mod gets ready for release again.
+
+Instead, you'll want to head towards ``minecraft/tools/LanguageMerger/LanguageFiles``
+
+The LanguageMerger is a Localization Tool used to Merge multiple JSON files into a single output, which is then loaded in Minecraft.
+
+Their folder structure is split into three layers.
+
+* MODID: The ID of the mod, ie: tfc for TerraFirmaCraft
+  * LOCALE: The target Locale to write for, ie: en_us for American English, ru_ru for Russian
+    * JSON Files: All the files located in the Locale folder will be merged into a single JSON file for the specified Locale.
+
+For example, the files under ``LanguageFiles/tfc/en_us`` are the localization overrides for TerraFirmaCraft in the English Language
+
+## Adding new Localizations
+
+1. Inside the LanguageMerger's Language Files, open the folder of the mod you want to Localize.
+    * If the mod is not present, create a new folder with the mod's id's name.
+2. Open the Folder for your locale.
+    * If your desired locale does not exist, create it (ie: zh_cn).
+3. Open the JSON file related to the *type of thing* you're localizing.
+    * You can know the *type of thing* by looking at the first word of the Localization Token.
+    * IE: ``items.json`` for Items, ``blocks.json`` for Blocks
+    * If no JSON file exists, create it.
+4. Fill the Localization Keys using JSON
+
+## Running the Merger
+
+* To run the merger, go to ``minecraft/tools`` and run the LanguageMerger shortcut.
+
+## FAQ:
+
+### Q: I dont have a Windows Machine
+A: Assuming you have DotNet installed, you can use the dotnet command to execute the main .dll that contains the LanguageMerger.
+
+Open your Terminal and type the command ``dotnet LanguageMerger/bin/Debug/net8.0/LanguageMerger.dll``
+
+### Q: I have other questions
+A: You can ask in the TerraFirmaGreg discord server's forum post related to the [1.20 Modpack Contribution Megathread](https://discord.com/channels/400913133620822016/1331744604701069393). Ask there or ping @nebby1999

.github/README.md

@@ -49,6 +49,7 @@ and others, also all these mods have addons to diversify the gameplay even more!
 
 For the set-up guide, please feel free to head to the [CONTRIBUTING.md](CONTRIBUTING.md).
 
+If you're looking for Localizing the modpack to a Language, please feel free to head to the [LOCALIZATION CONTRIBUTING.md](LOCALIZATION_CONTRIBUTING.md)
 ![img](https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/image_readme.png?raw=true)
 
 

.gitignore

@@ -115,4 +115,5 @@ gtceu/prospection_cache/
 /tools/OresToFieldGuide/obj/*
 /tools/MarsBiomes/bin/*
 /tools/MarsBiomes/obj/*
-.vs/
+/tools/OUTPUT/*
+.vs/

TODO.md

@@ -8,6 +8,11 @@ Key:
 ## Field Guide & Quests
 - ⏳ Quest overhaul (being worked on by nebby and tomtomtom)
 - Fix other field guide pages that are referring to missing recipes (they're listed in the log)
+- Change the FirmaCiv spoke to General Transportation, add Immersive Aircraft onto it
+- Move the Hang glider quests to General Transportation, replace their position with the mining helmet.
+- Finish quest spoke: The Beneath
+- Finish quest spoke: GregTech
+
 
 ## Mods & Recipes
 - ✔ Move over the create deco and locometal recipes from 0.7.19 PRs, update the lights to use glowstone dust? (done by redeix)
@@ -32,6 +37,8 @@ Key:
 	- Add recipes for create additions' alternator/motor, adjust costs to match greate's SU
 	- Check LBB efficiency of creosote, think about removing lava
 - Change aircraft recipes to need mech crafter
+- Change framed button, pressure plates etc recipes to match other "normal" ones
+- Give "Aged Corn Whiskey" and "Aged Rye Whisky" status effects when drank
 
 ## Worldgen
 - ⏳ Redeix is working on some overworld structures

config/ftbquests/quests/chapters/lv__low_voltage.snbt

@@ -513,18 +513,18 @@
 		}
 		{
 			dependencies: ["7EED0084BA59FED1"]
-			description: ["quests.low_voltage.lv_age_progression.desc"]
+			description: ["{quests.low_voltage.lv_age_progression.desc}"]
 			icon: "gtceu:basic_electronic_circuit"
 			id: "648BCF486E16CCB2"
 			shape: "circle"
 			size: 1.5d
-			subtitle: "quests.low_voltage.lv_age_progression.subtitle"
+			subtitle: "{quests.low_voltage.lv_age_progression.subtitle}"
 			tasks: [{
 				id: "07CE2766ECA4B0D8"
 				title: "quests.low_voltage.lv_age_progression.task"
 				type: "checkmark"
 			}]
-			title: "quests.low_voltage.lv_age_progression.title"
+			title: "{quests.low_voltage.lv_age_progression.title}"
 			x: 0.0d
 			y: 4.5d
 		}

config/ftbquests/quests/chapters/mv__medium_voltage.snbt

@@ -1185,7 +1185,6 @@
 		{
 			dependencies: [
 				"5263F866638D875C"
-				"257DB4B39B2A928E"
 				"3D98819A799D2E64"
 			]
 			description: [

config/ftbquests/quests/chapters/progression.snbt

@@ -665,10 +665,7 @@
 			y: 8.0d
 		}
 		{
-			dependencies: [
-				"257DB4B39B2A928E"
-				"5B2696206205CB2E"
-			]
+			dependencies: ["5B2696206205CB2E"]
 			id: "70432F650591353C"
 			shape: "rsquare"
 			size: 0.66d