This repository was archived by the owner on Jul 3, 2025. It is now read-only.
Nebby/primtive quest rework#14
Merged
Merged
Conversation
# Conflicts: # kubejs/assets1/tfg/textures/item/terra_firma_greg.png # Conflicts: # kubejs/assets/tfg/textures/item/terra_firma_greg.png
…tive-quest-rework
…ework # Conflicts: # kubejs/startup_scripts/gtceu/materials.js
# Conflicts: # kubejs/startup_scripts/tfg/items.js
# Conflicts: # kubejs/assets/tfg/lang/en_us.json # kubejs/server_scripts/main_server_script.js # kubejs/server_scripts/minecraft/tags.js
# Conflicts: # kubejs/assets/gtceu/lang/en_us.json # kubejs/server_scripts/ae2/recipes.js # kubejs/server_scripts/afc/tags.js # kubejs/server_scripts/create/recipes.js # kubejs/server_scripts/gregtech/recipes.js # kubejs/server_scripts/gregtech/tags.js # kubejs/server_scripts/main_server_script.js # kubejs/server_scripts/minecraft/recipes.js # kubejs/server_scripts/tfc/recipes.js # kubejs/startup_scripts/gtceu/materials.js # kubejs/startup_scripts/tfg/items.js
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I already wrote this using the damn template but it deleted itself, thanks.
Anyways, this quest adds A LOT of changes, mostly to the primitive questline. Yada yada, you already probably know whats up...
Either way, some things of note:
There where some NASTY conflicts in some files, mostly because i originally found and replaced any mention of GT's liquid dyes in exchange for the TFC liquid dyes. There is code that replaces the GT LiquidDye material with the TFC variant, however, i had to reject this code so most likely you'll have to find and replace those references again, otherwise there'll be a bunch of broken recipes afoot.
I also had this code snippet in the TFCRecipes file, might be worth adding again.