Gp/1.7.0 dev#59
Merged
Ghostipedia merged 102 commits intomain-1.20.1-forgefrom Jul 12, 2025
Merged
Conversation
# Conflicts: # build.gradle # src/generated/resources/assets/cosmiccore/lang/en_ud.json # src/generated/resources/assets/cosmiccore/lang/en_us.json # src/generated/resources/data/forge/tags/blocks/mineable/wrench.json # src/main/java/com/ghostipedia/cosmiccore/common/data/CosmicBlocks.java # src/main/java/com/ghostipedia/cosmiccore/common/data/CosmicMachines.java
…o oe/ownership-change-1.7 # Conflicts: # gradle.properties
* Is this right? my first push * Fix and standardized neutronite assets Made neutronite sprites follow GTM's sprite layer's Neutronite sprites now contain 20 frames instead of 10 --------- Co-authored-by: Furuchi <matheuscarniello.mf@gmail.com> Co-authored-by: Ghostipedia <Ghostipedia@gmail.com>
It do be a bit broken/needs more math
* Is this right? my first push * Fix and standardized neutronite assets Made neutronite sprites follow GTM's sprite layer's Neutronite sprites now contain 20 frames instead of 10 * Addition of trinavine material-set Blocks still pending --------- Co-authored-by: Furuchi <matheuscarniello.mf@gmail.com> Co-authored-by: Ghostipedia <Ghostipedia@gmail.com>
* clean up item renderers for material icon sets * merge dn
* Add seed and Indicator rendering * Indicator Tweaks and Overlays * Minigame logic * UI Base * It all works * Spotless * First Numbers Balance Pass. * improve UI * Spotless * Some more tweaks * Some more spotless * Blep * Refactor HPCA indicator Renderer --------- Co-authored-by: MrQuentin <32539717+mrquentin@users.noreply.github.com>
* Add EU display option to ME controller * remove needless comment
* graddle fix to run server * graddle fix to run server * fix gtceu update changes * fix dimensional PSS * fix dimensional PSS * SPOTLESS * SPOTLESS * SPOTLESS * fix wireless data bug * spotless
* workableSteamHullModel * fix boilers * more shit idek if this works properly im just rawdogging these renderers rn * SidedWorkableHullRenderer * Cleanup HellFireFoundryWorkableRenderer * Fix problems in CosmicBlocks * Fixes for CosmicLCE and comment out CosmicCoilBlock * Fix amperage related problems * workableCasingModel fix * start of stellar iris //todo: clean up redundant methods * equivalentGlobal -> global * Move away from SufferingRenderer * More texture changes (newlines might be fucked) also .gitattributes * More changes * Explicitly set java to lf to enforce lf standard * Delete useless json file * hellfire foundry & HPCA indicator * remove some of these godforsaken newlines so the class can at least be scrolled through on a good day * getRelativeFacing -> getRelative * blood machien thing wha * stellar iris render * star ballast render, clean up both the iris & star ballast renders (gosh ghosti PLEASE don't just blindly copypaste my examples I stg) * one (1) compile error * WHY ARE THE TOOLTIPS IN 5 DIFFERENT FORMATS AAAAA * fix nebula coil renderer * fix dots in model names breaking existence checks * fix a couple of duplicate lang keys * datagen * spot them less * make creative heat thing not stack overflow me * fix stellar iris crashing because of missing models * fix hemoglobin transformer or something idk * fix hemorroid trasistor's render bounds being too small * renderer hardly knew'er * should be brighter oopsie * bounding thy box * ok so make sure to render the top AND the bottom face :kekw: * sportle * Remove depricated shouldCheckContents * fix hepatitis transporter ring offset * FINEEEEEEEEEEEEEEEEEEEEE I WONT BE LAZYYYYYYYYY FINEEEEEEEEEEEEEEEEEE * me when the spotless is applied * fix emi issue while im fixing things * switch from worldtime to player time * Suffering Chamber New Texture * Fix A recipe issue bc multi-amp lmoa * steam multis. * IM COMBUSTING IT IM COMBUSTING IT OH SO GOOD * type something about not cleaning up after yourself here but don't make it too obvious * team fix changes? idk I'm gonna play date everything * im compensating for my microreactor rn * i mill than bend'er to fix'er * Fix the ECEMachines * Spotless and the wonderful.... Java Imports??? * OMG IT FUCKING WORKS REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE * spotless * this commit really underscores what im trying to get at here * idk why this worked but hey. * i think with this spotless cosmic core is fully functioning again * OOPS! FORGOT TO SWITCH PROXIES! MY BAD! * Data Gen Agony * HPCAIndicator override fix * spotless :)))))))))))))) * Damn thing works again --------- Co-authored-by: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Co-authored-by: screret <68943070+screret@users.noreply.github.com> Co-authored-by: Ghostipedia <Ghostipedia@gmail.com>
Member
Author
|
The End of a Long Journey. |
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
8 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.
Unfortunately, Depth-Drill was the Branch that got branched off of while working on this.
This is, for lack of better words, the PR that helps aid in CosmicCores Migration to Future Versions of Gregtech (1.7.0 namely)
DO. NOT. MERGE.
I will write a exhaustive list of changes made after all has been confirmed.