C-H716 e232fc4e4f Merge branch 'refs/heads/master' into develop/fix ... # Conflicts: # src/main/java/com/extendedae_plus/compat/CompatibilityTest.java # src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java # src/main/java/com/extendedae_plus/mixin/ae2/items/QuartzCuttingKnifeItemMixin.java # src/main/java/com/extendedae_plus/mixin/appflux/AppfluxPatternProviderLogicMixin.java # src/main/java/com/extendedae_plus/mixin/extendedae/client/gui/GuiExPatternProviderMixin.java		2025-10-03 11:51:46 +08:00
..
AppfluxPatternProviderLogicMixin.java	Merge branch 'refs/heads/master' into develop/fix	2025-10-03 11:51:46 +08:00