BallOfEnergy1 53f20f67a0 Merge remote-tracking branch 'refs/remotes/upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ModEventHandlerClient.java
#	src/main/java/com/hbm/main/ResourceManager.java
#	src/main/java/com/hbm/util/EntityDamageUtil.java
2024-11-19 14:42:25 -06:00
..
2024-09-13 13:17:51 +02:00
2022-12-12 22:39:07 +01:00
2024-10-21 21:11:45 +02:00
2020-11-22 16:18:10 +01:00