1215 Commits

Author SHA1 Message Date
BallOfEnergy
1bd15dfa78 fixes after the merge conflicts (death) 2024-09-06 22:28:00 -05:00
BallOfEnergy
11a4d5ccf7 Merge remote-tracking branch 'origin/Optimization' into Optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
#	src/main/java/com/hbm/tileentity/TileEntityTickingBase.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarScreen.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
#	src/main/java/com/hbm/tileentity/network/TileEntityRequestNetworkContainer.java
2024-09-06 22:26:53 -05:00
Boblet
0809bc223f Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself. 2024-09-06 22:05:50 -05:00
BallOfEnergy
1195f28d8e holy shit im done (part 2) 2024-09-06 22:04:19 -05:00
BallOfEnergy
f8e6a60d0f holy shit what the fuck am i smoking 2024-09-06 21:59:06 -05:00
BallOfEnergy
47657366cc the ByteBuf shenanigans begin!! 2024-09-06 21:59:06 -05:00
BallOfEnergy
931bbb3d8c oh my fucking god 2024-09-06 21:59:05 -05:00
BallOfEnergy
bc0d1059d8 i want to kill myself ❤️ 2024-09-06 21:59:03 -05:00
BallOfEnergy
8b5bfda162 more shit 2024-09-06 21:57:32 -05:00
BallOfEnergy
5a06075a9c fix up some imports! 2024-09-06 21:57:30 -05:00
BallOfEnergy
1aea83ad32 i fixed it i fixed it i fixed it i fixed it i fixed it i fixed it
fucking FINALLY
2024-09-06 21:57:00 -05:00
BallOfEnergy
06260e7f2b i am going to kms 2024-09-06 21:57:00 -05:00
BallOfEnergy
841852cc81 99.999% there
just some more optimization!
(node culling)
2024-09-06 21:56:58 -05:00
BallOfEnergy
639822b48d hooolyyyy shiiiiiiiit
i finally fixed the bug!!!!!!!!!!
2024-09-06 21:56:18 -05:00
BallOfEnergy
e32f67c2b2 this is fucking insane dude
RBMK optimization update soon!!!!!!!
2024-09-06 21:55:28 -05:00
BallOfEnergy
3e487dd528 fuck! 2024-09-06 21:54:17 -05:00
BallOfEnergy
16d2d86add holy shiiiiiiiiiitttt RBMK optimization update 2024-09-06 21:54:14 -05:00
Boblet
b7d0748c26 Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself. 2024-09-06 21:39:50 -05:00
BallOfEnergy
ec15e85e4e holy shit im done (part 2) 2024-09-06 19:43:18 -05:00
BallOfEnergy
4b490d56a1 holy shit what the fuck am i smoking 2024-09-04 21:37:37 -05:00
BallOfEnergy
05ca9203e9 the ByteBuf shenanigans begin!! 2024-09-02 21:39:28 -05:00
BallOfEnergy
bd25da4c1a oh my fucking god 2024-09-02 20:21:12 -05:00
Bob
13ffc6a66a refactor, new keybind system 2024-09-02 22:39:59 +02:00
BallOfEnergy
5902ff5189 i want to kill myself ❤️ 2024-09-02 15:17:07 -05:00
BallOfEnergy
e7419ef76b more shit 2024-09-01 19:55:49 -05:00
BallOfEnergy
9226af0719 fix up some imports! 2024-08-29 21:52:10 -05:00
BallOfEnergy
f245863945 Merge remote-tracking branch 'upstream/master' into RBMK_optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
2024-08-29 21:47:03 -05:00
BallOfEnergy
a8051b8bd9 i fixed it i fixed it i fixed it i fixed it i fixed it i fixed it
fucking FINALLY
2024-08-29 21:44:26 -05:00
BallOfEnergy
07a6301774 i am going to kms 2024-08-28 22:37:13 -05:00
Bob
e11b9a2a41 lesbian ponies with weapons 2024-08-27 22:27:11 +02:00
Boblet
85e3e50d54 ore density scanner HUD fix 2024-08-27 15:42:57 +02:00
Boblet
a391eda01d legalize 70 ton liquid fuel rocket engines 2024-08-26 16:15:08 +02:00
BallOfEnergy
2e4bdf943f 99.999% there
just some more optimization!
(node culling)
2024-08-25 22:19:04 -05:00
BallOfEnergy
05cc217bfe hooolyyyy shiiiiiiiit
i finally fixed the bug!!!!!!!!!!
2024-08-24 00:10:20 -05:00
HbmMods
a14899ad1e
Merge pull request #1625 from RosaTryp/machine-configs
More Machine Configs!
2024-08-22 14:37:16 +02:00
George Paton
0115928304 fix missing FENSU sync (soz bob) 2024-08-22 09:48:21 +10:00
RosaTryp
5d394bac15 Merge remote-tracking branch 'upstream/master' into machine-configs 2024-08-21 18:16:23 +02:00
Boblet
b8d24b5c2d battery packs 2024-08-20 16:30:15 +02:00
BallOfEnergy
fce0b08056 this is fucking insane dude
RBMK optimization update soon!!!!!!!
2024-08-19 19:11:54 -05:00
HbmMods
0e2b7e09b6
Merge branch 'master' into OC_bugfix 2024-08-19 15:10:57 +02:00
George Paton
9ee553fe14 Fix pumpjack tank sync 2024-08-19 12:25:24 +10:00
George Paton
402d54d669
Merge branch 'HbmMods:master' into master 2024-08-19 09:17:19 +10:00
BallOfEnergy
18bb7f63c4 fuck! 2024-08-18 14:30:34 -05:00
BallOfEnergy
3033d6e08e holy shiiiiiiiiiitttt RBMK optimization update 2024-08-18 14:25:33 -05:00
Bob
1caeec5ea9 d(err)ick 2024-08-18 21:00:27 +02:00
George Paton
f58d97c007 switch TEMachineBattery to bytebuf 2024-08-16 21:57:42 +10:00
BallOfEnergy
89c97abbdc i looked back here and nearly had a fucking stroke from this code 2024-08-15 15:59:01 -05:00
Bob
3aef7e1577 i love to drink oil 2024-08-15 20:38:22 +02:00
HbmMods
fd1bb4e28d
Merge pull request #1624 from BallOfEnergy1/OC_bugfix
WOO!!
2024-08-13 11:21:53 +02:00
Boblet
d70ea038a0 an big slappy 2024-08-12 16:26:09 +02:00