BallOfEnergy 02e9219b2e Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/extprop/HbmLivingProps.java
#	src/main/java/com/hbm/handler/EntityEffectHandler.java
2024-11-02 15:58:54 -05:00
..
2024-10-27 19:02:46 +01:00
2024-10-28 22:15:34 +01:00
2024-10-13 01:05:06 +02:00
2024-11-02 14:16:44 +01:00
2024-10-19 00:32:07 +02:00
2021-09-04 18:20:09 +02:00
2024-11-02 14:16:44 +01:00