Cherrypick stuff to 1.20#372
Merged
Merged
Conversation
* add ability to create renderer blocks from KJS, make the simple machines' arrays match the tier indexes * do the same to KJS machine builders
* first attempt at implementing machine modes screret pls help * fix the issue * next attempt for the configurator * latest commit * latest stuff * change activerecipetype to int * final touch + method rename * dev QoL stuffs * final commit * run data * js^3 support added --------- Co-authored-by: screret <joona.v.stenberg@gmail.com>
* gcmb first additions * fix ABS (no textures tho) * slight refactor * blast alloy changes * fix molten fluid texture (it was easy) * more refactoring * first attempt at implementing machine modes screret pls help * fix the issue * next attempt for the configurator * latest commit * latest stuff * change activerecipetype to int * final touch + method rename * dev QoL stuffs * final commit * run data * js^3 support added * final touch * Update GTRecipeTypes.java * Update GTMachines.java * gcmb first additions * slight refactor * fix ABS (no textures tho) * blast alloy changes * fix molten fluid texture (it was easy) * more refactoring * first attempt at implementing machine modes screret pls help * fix the issue * next attempt for the configurator * latest stuff * change activerecipetype to int * final touch + method rename * js^3 support added * dev QoL stuffs * run data * gcmb first additions * slight refactor * fix ABS (no textures tho) * blast alloy changes * fix molten fluid texture (it was easy) * gcmb first additions * fix ABS (no textures tho) * blast alloy changes * fix molten fluid texture (it was easy) * fix some KJS builders having issues in array indexing, rebase to upstream * fix some KJS builders having issues in array indexing, rebase to upstream HOLY SHIT THIS WAS PAINFUL * add the parallel hatch, fix a lot of bugs, rename the casings to make sense, etc. run data. * parallel hatches + missing multis * finalized * requested fixes * datagen * more requested changes + datagen * Update common/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java --------- Co-authored-by: screret <68943070+screret@users.noreply.github.com>
Member
|
@screret do I need to review the first four commits as well or are those just exact cherrypicks as they are in 1.19? |
Contributor
Author
|
exact. |
Member
|
alright, I'll review just by the last commit then |
Contributor
Author
|
there's nothing to review tho |
screret
added a commit
that referenced
this pull request
Nov 23, 2023
* add a KJS block type for renderer blocks. (#353) * add ability to create renderer blocks from KJS, make the simple machines' arrays match the tier indexes * do the same to KJS machine builders * Implementation of Machine Modes (#359) * first attempt at implementing machine modes screret pls help * fix the issue * next attempt for the configurator * latest commit * latest stuff * change activerecipetype to int * final touch + method rename * dev QoL stuffs * final commit * run data * js^3 support added --------- Co-authored-by: screret <joona.v.stenberg@gmail.com> * shit. these should stack. * Implementation of Gregicality Multiblocks (#369) * gcmb first additions * fix ABS (no textures tho) * slight refactor * blast alloy changes * fix molten fluid texture (it was easy) * more refactoring * first attempt at implementing machine modes screret pls help * fix the issue * next attempt for the configurator * latest commit * latest stuff * change activerecipetype to int * final touch + method rename * dev QoL stuffs * final commit * run data * js^3 support added * final touch * Update GTRecipeTypes.java * Update GTMachines.java * gcmb first additions * slight refactor * fix ABS (no textures tho) * blast alloy changes * fix molten fluid texture (it was easy) * more refactoring * first attempt at implementing machine modes screret pls help * fix the issue * next attempt for the configurator * latest stuff * change activerecipetype to int * final touch + method rename * js^3 support added * dev QoL stuffs * run data * gcmb first additions * slight refactor * fix ABS (no textures tho) * blast alloy changes * fix molten fluid texture (it was easy) * gcmb first additions * fix ABS (no textures tho) * blast alloy changes * fix molten fluid texture (it was easy) * fix some KJS builders having issues in array indexing, rebase to upstream * fix some KJS builders having issues in array indexing, rebase to upstream HOLY SHIT THIS WAS PAINFUL * add the parallel hatch, fix a lot of bugs, rename the casings to make sense, etc. run data. * parallel hatches + missing multis * finalized * requested fixes * datagen * more requested changes + datagen * Update common/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java --------- Co-authored-by: screret <68943070+screret@users.noreply.github.com> * it didnt build lol --------- Co-authored-by: Rundas <38040866+Rundas01@users.noreply.github.com>
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.