4149 Commits

Author SHA1 Message Date
BallOfEnergy
c25f4c8d60 Fix /ntmpackets command registration.
Fix small race condition with a ReentrantLock.
2025-01-03 20:29:17 -06:00
BallOfEnergy
9a22c343c9 Chicago Pile fix ClassCastException. 2024-12-31 17:18:04 -06:00
BallOfEnergy
86de688469
Merge branch 'HbmMods:master' into Optimization 2024-12-29 05:58:39 -06:00
BallOfEnergy
c941cb8717 am i retarded
fucky wucky pt. 4
2024-12-29 05:56:26 -06:00
BallOfEnergy
fe23c67967 fucky wucky pt. 3 2024-12-29 05:52:19 -06:00
HbmMods
5cf06f2055
Merge pull request #1837 from Nycticoraxnightheron/101
zh_CN update
2024-12-29 12:42:49 +01:00
BallOfEnergy
78aba275ce fucky wucky pt. 2 2024-12-29 05:41:53 -06:00
Night Heron
c1cea71240
Add files via upload 2024-12-29 00:26:31 +08:00
BallOfEnergy
803320d118 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ResourceManager.java
2024-12-27 17:57:20 -06:00
HbmMods
5c053ea78f
Merge pull request #1833 from Vaern/idk
added new g3 wooden + polymer tex, fixed uv
2024-12-28 00:31:02 +01:00
Bob
dbcb2e2aa2 spontaneous comeback 1.0.27_X5193 2024-12-28 00:16:38 +01:00
Vaern
e4b5b40256 added new g3 wooden + polymer tex, fixed uv 2024-12-26 23:37:57 -08:00
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
BallOfEnergy
9d3a3b1fff fucky wucky (kms) 2024-12-26 19:27:31 -06:00
Bob
89a3a1f9bc fixes 2024-12-27 01:01:51 +01:00
Bob
d7776b52d5 roblox death sound 1.0.27_X5188 2024-12-23 23:56:43 +01:00
HbmMods
e04e5aff1d
Merge pull request #1821 from MellowArpeggiation/master
A few animation fixes more
2024-12-23 21:32:18 +01:00
Bob
1bccba82bb god giveth, and god taketh away 2024-12-23 21:31:33 +01:00
George Paton
2613902a73 wrong swizzle order 2024-12-23 12:57:21 +11:00
George Paton
cca5300deb
Merge branch 'HbmMods:master' into master 2024-12-23 12:43:26 +11:00
George Paton
d56f30a4fa properly add rotmode to animation .json spec, including import/export 2024-12-23 12:33:21 +11:00
Bob
6e44aeea8d return the slab, or suffer my curse 2024-12-23 01:01:29 +01:00
Bob
10f62b88e1 the malicious gigglefish from the silly dimension 2024-12-22 00:41:10 +01:00
BallOfEnergy
9d2aa86e41 well crap this was an oops 2024-12-21 12:40:11 -06:00
BallOfEnergy
88c1632481 fix some stuff, also fix sending exactly 19x more packets than needed lmao 2024-12-20 17:54:45 -06:00
Bob
340de04936 tweaks 2024-12-20 21:46:50 +01:00
BallOfEnergy
90cfd37a31 an absolutely goofy command I'd say (also yet another failsafe, this time for a ton of packet discarding.) 2024-12-19 21:55:41 -06:00
BallOfEnergy
4f06914c39 Packet threading debug command!!
(Also packet threading config option)
2024-12-18 10:52:33 -06:00
BallOfEnergy
6ccb585c40
Merge branch 'HbmMods:master' into Optimization 2024-12-18 09:43:40 -06:00
Boblet
1930670e5f pins and needles 2024-12-18 16:37:11 +01:00
BallOfEnergy
1ffebc5aa2 Merge remote-tracking branch 'origin/Optimization' into Optimization 2024-12-18 08:32:42 -06:00
BallOfEnergy
85743e85f4 More RAM optimizations with buffer releasing. Also fix a bug in RBMK processing and a few merge-related errors. 2024-12-18 08:32:30 -06:00
HbmMods
6d1243b500
Merge pull request #1812 from Nycticoraxnightheron/101
I forgot the oven, but it is done
2024-12-18 08:16:51 +01:00
BallOfEnergy
7a0ee15a7e
Merge branch 'HbmMods:master' into Optimization 2024-12-17 10:51:51 -06:00
Night Heron
d1d20ec4bb
Add files via upload 2024-12-18 00:43:26 +08:00
Boblet
bfdc145eb0 smonking that fentanyl 2024-12-17 16:51:02 +01:00
George Paton
67eb2be5a7 Add swizzling for animations not authored with YZX rotations within blender (haven't updated the import/export yet) 2024-12-17 19:55:37 +08:00
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
George Paton
700e02223f read the damn headers, shitlid 2024-12-17 16:03:07 +08:00
BallOfEnergy
7a16a8ba9f Merge remote-tracking branch 'origin/Optimization' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ModEventHandlerClient.java
#	src/main/java/com/hbm/util/CompatExternal.java
2024-12-16 18:25:14 -06: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
HbmMods
78d61348bf
Merge pull request #1767 from FOlkvangrField/Custom-fluid-pollution-fix
Custom fluid traits fix
2024-12-16 16:08:51 +01:00
HbmMods
74a87e90e8
Merge pull request #1805 from Nycticoraxnightheron/101
Repair of zh_CN files
2024-12-16 16:07:25 +01:00
Boblet
ce3bff94eb let's go to stalingrad, it will be fun 2024-12-16 15:59:41 +01:00
FOlkvangrField
d009f614d4
Merge branch 'master' into Custom-fluid-pollution-fix 2024-12-16 22:56:43 +08:00
Night Heron
42d52fe060
Add files via upload
i love  my hand
2024-12-16 12:18:34 +08:00
Bob
c60f5cf400 been livin' livid in a mirror maze 1.0.27_X5180 2024-12-15 20:50:16 +01:00
Bob
28ae1df25e now that was a rather productive segment 2024-12-14 22:05:48 +01:00
BallOfEnergy
99705897ed Merge remote-tracking branch 'main/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/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/EntityDamageUtil.java
2024-12-13 12:04:21 -06:00