BallOfEnergy e1bdae1241 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/blocks/ModBlocks.java
#	src/main/java/com/hbm/lib/HbmCollection.java
#	src/main/java/com/hbm/main/ClientProxy.java
#	src/main/java/com/hbm/main/MainRegistry.java
#	src/main/java/com/hbm/main/ModEventHandler.java
#	src/main/java/com/hbm/main/NEIConfig.java
#	src/main/java/com/hbm/util/LootGenerator.java
2024-12-26 19:43:36 -06:00
..
2024-02-01 21:37:57 +01:00
2024-12-23 23:56:43 +01:00