HbmMods
|
807f1a7525
|
Merge branch 'master' into Optimization
|
2024-12-17 11:38:41 +01:00 |
|
Boblet
|
9b149f3e3d
|
trash incineration
|
2024-12-17 11:37:37 +01:00 |
|
BallOfEnergy
|
2776a6f347
|
Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
# src/main/java/com/hbm/blocks/ModBlocks.java
# src/main/java/com/hbm/handler/EntityEffectHandler.java
# src/main/java/com/hbm/main/ClientProxy.java
# src/main/java/com/hbm/main/CraftingManager.java
# src/main/java/com/hbm/main/MainRegistry.java
# src/main/java/com/hbm/main/ModEventHandlerClient.java
# src/main/java/com/hbm/main/ModEventHandlerRenderer.java
# src/main/java/com/hbm/main/NEIConfig.java
# src/main/java/com/hbm/main/ResourceManager.java
# src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java
# src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java
# src/main/java/com/hbm/tileentity/turret/TileEntityTurretSentry.java
# src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java
# src/main/java/com/hbm/util/CompatExternal.java
# src/main/java/com/hbm/util/CrucibleUtil.java
# src/main/java/com/hbm/util/EntityDamageUtil.java
|
2024-12-16 18:18:46 -06:00 |
|
Boblet
|
ce3bff94eb
|
let's go to stalingrad, it will be fun
|
2024-12-16 15:59:41 +01:00 |
|
BallOfEnergy
|
4bd6f0df53
|
More shit, also precompiled packets.
also holy shit the whitespace changes, intelliJ wanted to optimize the imports and refactored a ton of whitespace in the process.
|
2024-11-09 17:04:19 -06:00 |
|
Bob
|
727a158ed1
|
bauxite, achievement stuff, fixes
|
2023-05-28 21:53:58 +02:00 |
|