Skip to content

Navigation Menu

Appearance settings

View all features
- BY COMPANY SIZE
  Enterprises
  Small and medium teams
  Startups
  Nonprofits
- BY USE CASE
  App Modernization
  DevSecOps
  DevOps
  CI/CD
  View all use cases
- BY INDUSTRY
  Healthcare
  Financial services
  Manufacturing
  Government
  View all industries
View all solutions
- EXPLORE BY TOPIC
  AI
  Software Development
  DevOps
  Security
  View all topics
- EXPLORE BY TYPE
  Customer stories
  Events & webinars
  Ebooks & reports
  Business insights
  GitHub Skills
- SUPPORT & SERVICES
  Documentation
  Customer support
  Community forum
  Trust center
  Partners
View all resources
- COMMUNITY
  GitHub SponsorsFund open source developers
- PROGRAMS
  Security Lab
  Maintainer Community
  Accelerator
  GitHub Stars
  Archive Program
- REPOSITORIES
  Topics
  Trending
  Collections
- ENTERPRISE SOLUTIONS
  Enterprise platformAI-powered developer platform
- AVAILABLE ADD-ONS
  GitHub Advanced SecurityEnterprise-grade security features
  Copilot for BusinessEnterprise-grade AI features
  Premium SupportEnterprise-grade 24/7 support
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

Appearance settings

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

GregTechCEu / GregTech-Modern Public

Notifications You must be signed in to change notification settings
Fork 354
Star 480

Code
Issues 326
Pull requests 48
Actions
Projects
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Wiki
Security
Insights

Undo bad 1.21 merge changes#4697

Merged

gustovafing merged 83 commits intoGregTechCEu:1.21GregTechCEu/GregTech-Modern:1.21from

screret:sc/undo-bad-1.21-merge-changesscreret/GregTech-Modern:sc/undo-bad-1.21-merge-changesCopy head branch name to clipboard

Feb 26, 2026

Conversation Commits83 (83)Checks Files changed

Merged

Undo bad 1.21 merge changes#4697
gustovafing merged 83 commits intoGregTechCEu:1.21from
screret:sc/undo-bad-1.21-merge-changes

Commits

Commits on Feb 21, 2026

undo (some? of the) translation reverts
screret
committed
forge_data -> neoforge_data
screret
committed
use NeoForge's new dimension name translations for dimension makers' names
screret
committed
update steam boiler logic values
screret
committed
more correct enchant merging (do not ignore the actual enchantment table enchants if there aren't any innate enchants)
screret
committed
allow using any namespace for material armor textures
screret
committed
Fix GT's KubeJS **machine** builders not actually _using_ the given namespace (presumably because of a merging mistake?)
screret
committed
fix GT builder types being in the minecraft namespace
screret
committed
nullability annotation cleanup day
screret
committed
clean up recipe category & condition registration
screret
committed
fix duplicated/missing init calls
screret
committed
make item decorators less convoluted
screret
committed
unrevert config initialization code
screret
committed
remove unused `dumpDataRegistry` method in GTCommands
screret
committed
streamline GTDynamic(Data/Resource)Pack addition handling & add a method for adding 'active' namespaces to them
screret
committed
Unrevert GTRecipeSchema TagKey changes
screret
committed
fix duplicate model init in ModelManagerMixin (ClientInit also does that)
screret
committed
javac didn't like this cast
screret
committed

Commits on Feb 23, 2026

remove '-dev' suffix from the NORMAL jar file
screret
committed
remove duplicate create maven entry
screret
committed
remove all mentions of shimmer
screret
committed
remove unused ae2wtlib dependency
screret
committed
remove commented/duplicate dependencies & reorder them to be saner
screret
committed
update FTB mods
screret
committed
update rendernurse, add .run/ to .gitignore
screret
committed
move BlockAttributes to a much better package, clean up the application & FOV code
screret
committed
move GTBlockStateProperties to the data/block package
screret
committed
delete IAppearance and AppearanceBlock
screret
committed
fix PipeBlock#getShape no longer checking tool actions (because of bad merge)
screret
committed
fix machine capability implementations not being merged at all
screret
committed
remove `GTUtil.isSameItemSameTags` (why wasn't this just merged as `ItemStack.isSameItemSameComponents`??)
screret
committed
start porting tests to the NeoForge test framework
screret
committed
fix porting todo in RecipeOutputProvider
screret
committed
remove GTUtil.getLast because it's part of List now
screret
committed
Fix ignore NBT not working properly on 1.21
screret
committed
formatting changes and such
screret
committed
Fix SyncedKeyMappings not being initialized properly
screret
committed
fix equipment change event listener not existing (???)
screret
committed
remove duplicate of vanilla fluid placement code from GTBucketItem, implement evaporation properly
screret
committed
make ProspectingBehavior code neater
screret
committed
undo a very weird change
screret
committed
fix SteamEnergyRecipeHandler merge
screret
committed
Make MaterialFlags.NO_UNIFICATION just a rename of MaterialFlags.DISABLE_MATERIAL_RECIPES
screret
committed
remove unnecessary public access level assignment
screret
committed
allow using any namespace for custom armor textures
screret
committed
Merge branch 'refs/heads/sc/fix-4239-issues' into sc/undo-bad-1.21-merge-changes
screret
committed
fix int provider ingredients' codecs
screret
committed
nicer single plate facade recipe
screret
committed
delete the old recipe lookup implementation
screret
committed
simplify recipe condition network serialization
screret
committed
revert GTRegistries changes
screret
committed
better DataItemComponentFix
screret
committed
add note about TPS being changeable in 1.21
screret
committed
use safe model data getter in rendering
screret
committed
remove empty onBlockEntityRegister methods. again.
screret
committed
delete duplicate computer monitor cover
screret
committed
undo cover interaction ability revert
screret
committed
fix janky data item code
screret
committed
uncomment argonauts & heracles integrations
screret
committed
use neoforge provided packet sending functionality
screret
committed
MOAR FORMATTING CHANGES
screret
committed
remove all the duplicate adjacency condition setters. again.
screret
committed
move renderer configs into the client block. Again.
screret
committed
moar formatting changews
screret
committed
base stone thingamagick
screret
committed
fix int provider fluid ingredient map ingredient registration
screret
committed
remove unused (and also duplicate) concrete tags
screret
committed
remove even more duplicate data components
screret
committed
uncomment wireless transmitter cover recipe
screret
committed
even more merge msitakes
screret
committed
tidy up the stream things in emi compat a bit
screret
committed
Fix KubeJS recipe component types
screret
committed
remove debug logging in GTLDLibPlugin
screret
committed
use accessor instead of duplicating map color array
screret
committed
clean up model changes
screret
committed
apply automatic reordering on mixin JSON
screret
committed

Commits on Feb 26, 2026

remove things that broke when I split the GTResourceLocation changes into a separate PR
screret
committed
fix create mod dependency resolution
screret
committed
Oh, that wasn't supposed to be reverted either, oops
screret
committed
Fix tests
screret
committed
Fix KJS ore/fluid vein events not working
screret
committed
clean up the GT Jade fluid storage provider
screret
committed
Spotless
screret
committed

Footer

© 2026 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Community
Docs
Contact

You can’t perform that action at this time.