Skip to content
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

fix: compile errors #957

Merged
merged 7 commits into from
Mar 8, 2024
Merged

fix: compile errors #957

merged 7 commits into from
Mar 8, 2024

Conversation

mikerooni
Copy link
Member

What

Fixes recent compile errors

@mikerooni mikerooni requested a review from a team as a code owner March 8, 2024 00:48
Copy link
Member

@stanieldev stanieldev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you Mike

Copy link
Member

@stanieldev stanieldev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not yet bozo :P

@mikerooni
Copy link
Member Author

Alright, now I'm done (this time for real) :lets:

Copy link
Member

@stanieldev stanieldev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolute lifesaver, you are

@stanieldev stanieldev merged commit 7554d1d into 1.20.1 Mar 8, 2024
1 check passed
@stanieldev stanieldev deleted the mi/fix-compile branch March 8, 2024 01:14
mikerooni added a commit that referenced this pull request Mar 23, 2024
* fix: compile errors

* chore: run a build in PRs

* chore: rename CI action for PRs

* fix: compile error in FisherMachine

* chore: suppress deprecation warnings for processing array in GTMachines

* chore: revert previous commit as it didn't seem to change anything...

* chore: store PR build output artifacts
mikerooni added a commit that referenced this pull request Mar 23, 2024
* Update lang file ru_ru.json (#913)

* Translated using Weblate (Russian)

Currently translated at 99.9% (5046 of 5048 strings)

Translation: Gregicality/GregTech Modern
Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/

* Translated using Weblate (Russian)

Currently translated at 100.0% (5063 of 5063 strings)

Translation: Gregicality/GregTech Modern
Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/

---------

Co-authored-by: Western01 <[email protected]>

* Fix RecipeManagerMixin not discovering proxy recipes (#922)

* Added Overworld Dimension Requirement to All "overworld" Fluid veins (#918)

* implemented fix from #930 (#933)

Co-authored-by: rmi <[email protected]>

* added GTCEu Magnet Curios slots (#920)

* Fix multi-amp transformer capacity (#944)

Authored-by: sirjoekcb <[email protected]>
Reviewed-by: StanielDevito <[email protected]>

* fix machines not connecting to already placed cables (#956)

* 1.20.1 fixes (#950)

* Fixes #949

* Fixes #945

---------

Co-authored-by: rmi <[email protected]>

* Add Coke Oven, EFB, Large Boiler, pages to compass (#953)

* Item Collector + other random fixes (#943)

* Item Collector Progress

* Item Collector Functionality

* Item Collector Functionality

* Item Collector progress & minor GT code cleanup

* attempt at fixing fisher causing hang

* fix broken active state on itemcollector

* Implemented configurable itemcollector range

* Update FisherMachine.java

* Update GTMachines.java

Changed itemcollector tooltipbuilder to tooltips()

---------

Co-authored-by: rmi <[email protected]>

* make ItemBus fillable, AE2 filling for all EMI recipes. (#927)

* Make defensive copies of GTRecipe.conditions list to avoid ConcurrentModificationException (#935)

* Large boiler fixes (#938)

* Update steam output display from large boiler based on throttle

* Update fuel consumption on changing throttle

---------

Co-authored-by: sirjoekcb <[email protected]>

* Add Ores Blocks in Collapsible Entry for REI (#948)

* Fix description of Impure ore cauldron actions (#929)

* Added Overworld Dimension Requirement to All "overworld" Fluid veins

* Removed ln32 comment

* Cauldron Action Lang fixes

* Cauldron Action Lang fixes to LangHandler.java

---------

Co-authored-by: Mikerooni <[email protected]>

* fix: compile errors (#957)

* fix: compile errors

* chore: run a build in PRs

* chore: rename CI action for PRs

* fix: compile error in FisherMachine

* chore: suppress deprecation warnings for processing array in GTMachines

* chore: revert previous commit as it didn't seem to change anything...

* chore: store PR build output artifacts

* Use singleton EmptyMapMarkerEntry instead of null in ITEM_UNIFICATION_ENTRY_COLLECTED (#966)

Co-authored-by: sirjoekcb <[email protected]>

* small lang update (#963)

* Translated using Weblate (Russian)

Currently translated at 100.0% (5062 of 5062 strings)

Translation: Gregicality/GregTech Modern
Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/

* Translated using Weblate (Russian)

Currently translated at 100.0% (5062 of 5062 strings)

Translation: Gregicality/GregTech Modern
Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/

* Translated using Weblate (Russian)

Currently translated at 99.9% (5063 of 5067 strings)

Translation: Gregicality/GregTech Modern
Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/

* Translated using Weblate (Russian)

Currently translated at 100.0% (5067 of 5067 strings)

Translation: Gregicality/GregTech Modern
Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/

---------

Co-authored-by: Western01 <[email protected]>

* update zh_cn localization (#968)

* Update zh_cn.json

* Update zh_cn.json

* Update zh_cn.json

* update zh_cn

---------

Co-authored-by: KilaBash <[email protected]>

* fix emi issue in server (#976)

* fix orevein recipes empty on server

* ??

* fix? KJS not being able to remove tags from GT items/blocks/whatever (#981)

* Cache JEI size instead of needlessly creating a new template each time (#987)

* Avoid O(n) lookup behavior in ChemicalHelper (#986)

* buff the large miner's fortune to be at least 3x guaranteed. (#985)

* fix bucket model (#984)

* fix bucket model

* better solution

* fix chainsaw always using durability for tree felling (#983)

* fix some issues with fluid drilling rigs (#970) + add extra tooltips (#982)

* fix the large miner crashing when cycling layers (#980)

fixes #972

* fix large miner crushed ore issue (#996)

* Mi/fixes (#979)

* chore: update ldlib to 1.0.24.a

* refactor: remove async recipe searching

* fix: make UI titles only roll on hover

* fix: move titlebar text to center again

* refactor: early return in GTRecipe.handlerContentsInternal()

* fix: reintroduce combined inventory for item bus machines (temporary)

* fix: only roll multiblock part names on hover

* chore: version and changelog

* chore: datagen

* fix: compile errors

* chore: datagen

---------

Co-authored-by: marisathewitch <[email protected]>
Co-authored-by: Western01 <[email protected]>
Co-authored-by: ctrlaltmilk <[email protected]>
Co-authored-by: Ghostipedia <[email protected]>
Co-authored-by: Markh3tr <[email protected]>
Co-authored-by: rmi <[email protected]>
Co-authored-by: Drackion <[email protected]>
Co-authored-by: sirjoekcb <[email protected]>
Co-authored-by: PrototypeTrousers <[email protected]>
Co-authored-by: BlackDragon2447 <[email protected]>
Co-authored-by: Arbor <[email protected]>
Co-authored-by: thedarkcolour <[email protected]>
Co-authored-by: sirjoekcb <[email protected]>
Co-authored-by: Usow Maxim <[email protected]>
Co-authored-by: iouter <[email protected]>
Co-authored-by: KilaBash <[email protected]>
Co-authored-by: screret <[email protected]>
Co-authored-by: embeddedt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants