-
Notifications
You must be signed in to change notification settings - Fork 25
The Great Tinkering. #140
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Ghostipedia
wants to merge
114
commits into
main-1.20.1-forge
Choose a base branch
from
gp/the-great-retinkering
base: main-1.20.1-forge
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
The Great Tinkering. #140
Conversation
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
…p/the-great-retinkering
(IDK IF ANYTHING ELSE WORKS LOL)
* tried to get modifiers to work in tinkers * tried to get modifiers to work in tinkers * confict cleanup * got machine interaction to work with specific modifier/traits * timker wrenches now fully work on gt machines and pipes :3 * sounds and durability now work with the tool interactions and some clean up --------- Co-authored-by: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com> Co-authored-by: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com>
# Conflicts: # gradle/forge.versions.toml # src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java # src/main/resources/cosmiccore.mixins.json
…p/the-great-retinkering
* tried to get modifiers to work in tinkers * tried to get modifiers to work in tinkers * confict cleanup * got machine interaction to work with specific modifier/traits * timker wrenches now fully work on gt machines and pipes :3 * sounds and durability now work with the tool interactions and some clean up * more tools * clean up * start eu items for timkers * we have nbt :pepechill: * still no work. what the fuck this game is so shitty. * still takes damage :( * i hate mixins * oops wrong target * edit other mixins for discharging tool power * sportl --------- Co-authored-by: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com>
* mixin to increase toughness of netherrack * onion's ae2uel pr * cleanup and mixin finish * remap = true
…146) * step one of tinkers material builder system //todo EVERYTHING THAT I DIDNT DO * spotless this thing * start CosmicTinkersMaterials.java * dynamically generate tool stats now * oops no errors * HELP!!!!! * FUCK THIS FUCKASS GAME HOLY SHIT * test datagen PLEASE REMMBER TO DELETE * lets just make it clean so i can cry * Fix datagen * Add noTrait so material at least gets registered * i really hope i don't have to do too much more for color * //todo: cleanup? i think this is jsut about done holy shit im free * tinkersSpotless * BETTER MATERIAL * every tool prop now has tinkers. todo/ make this not shit (also lang) --------- Co-authored-by: jurrejelle <jurre@jilles.com>
# Conflicts: # src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java # src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersMaterials.java
* Create module hatch + parallel modifier function * spotless * by god, now there's 3 of them * Fix recipe modifier, change lang --------- Co-authored-by: Ghostipedia / Caitlynn <46772882+Ghostipedia@users.noreply.github.com>
* revert blocking mode, as it is now in ae2cl * remove multiply/divide buttons from the processing encoding panel, as they are now in ae2cl * datagen stuff * spotless ig --------- Co-authored-by: Kolja <104643407+Thatguyello@users.noreply.github.com>
Co-authored-by: Kolja <104643407+Thatguyello@users.noreply.github.com>
* All the Bee Stuff * Prime the Ind. Apiary #2 * Final Comments * Stupid Ass Pale Saw so it loads. * Bee recipe logic (#145) * First try for bees * The bees do something :lfg * Pale Scrap, Oil, LV-HV Prod. Apiaries Rates * Agony * Bee Holder * The Really Big Bee Boy * spotless * Implement MegaAlvearyRecipeLogic * New bees (#147) * Overclock fluids for HONEY * Group products by species * Fluids & Number Logic - Need Textures --------- Co-authored-by: Ghostipedia <Ghostipedia@gmail.com> Co-authored-by: Ghostipedia / Caitlynn <46772882+Ghostipedia@users.noreply.github.com> * Dear IntelliJ Please stop freezing * Like, most of the bee stuff yo. * The fuckin uhhh, assemblyline stuff * Apply parallels correctly * This Branch is a nightmare --------- Co-authored-by: Jurre Groenendijk <jurre@jilles.com>
* remove style manager mixin and subsequent files as this is now in ae2cl, and wireless terminals will automatically include the buttons to this mixin is not needed anymore --------- Co-authored-by: Kolja <104643407+Thatguyello@users.noreply.github.com>
* Diving bell implementation The whole dang thing. * Go go gadget apply spotless * Add linked multiblock system and moth cargo stations * Whoops I was on the PR oh well fuck it --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> Co-authored-by: Ghostipedia <Ghostipedia@gmail.com>
* Fix ember capability paralelling * suggestions + spotless
* tried to get modifiers to work in tinkers * tried to get modifiers to work in tinkers * confict cleanup * got machine interaction to work with specific modifier/traits * timker wrenches now fully work on gt machines and pipes :3 * sounds and durability now work with the tool interactions and some clean up --------- Co-authored-by: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com> Co-authored-by: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com>
* mixin to increase toughness of netherrack * onion's ae2uel pr * cleanup and mixin finish * remap = true
…146) * step one of tinkers material builder system //todo EVERYTHING THAT I DIDNT DO * spotless this thing * start CosmicTinkersMaterials.java * dynamically generate tool stats now * oops no errors * HELP!!!!! * FUCK THIS FUCKASS GAME HOLY SHIT * test datagen PLEASE REMMBER TO DELETE * lets just make it clean so i can cry * Fix datagen * Add noTrait so material at least gets registered * i really hope i don't have to do too much more for color * //todo: cleanup? i think this is jsut about done holy shit im free * tinkersSpotless * BETTER MATERIAL * every tool prop now has tinkers. todo/ make this not shit (also lang) --------- Co-authored-by: jurrejelle <jurre@jilles.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Tinkers Tools, Updated.