BallOfEnergy 52b781ea9f Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/api/hbm/energymk2/IEnergyReceiverMK2.java
#	src/main/java/com/hbm/items/weapon/ItemAmmoArty.java
#	src/main/java/com/hbm/items/weapon/sedna/factory/ConfettiUtil.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java
2025-03-07 22:06:13 -06:00
..
2024-10-26 01:13:09 +02:00
2023-05-07 20:30:54 +02:00
2025-03-05 16:57:50 +01:00
2024-05-26 21:16:43 +02:00
2021-09-04 18:20:09 +02:00
2023-10-22 18:17:07 +02:00
2024-05-24 15:03:17 +02:00
2023-06-21 13:53:15 +02:00
2023-10-23 16:55:38 +02:00