3281 Commits

Author SHA1 Message Date
70000hp
4a72e201cf removed unused lang, removed No_Disperse 2023-12-11 18:58:34 -05:00
Bob
9448d51e02 fuck you 1.0.27X4809H1 2023-12-10 21:15:53 +01:00
HbmMods
992bf1e929
Merge pull request #1269 from BallOfEnergy1/New_master
so sorry
2023-12-10 21:01:33 +01:00
BallOfEnergy
7dad773786 Merge remote-tracking branch 'origin/New_master'
# Conflicts:
#	changelog
2023-12-10 14:00:36 -06:00
BallOfEnergy
b6345644ed shit shit shit shit shit shit 2023-12-10 13:59:39 -06:00
HbmMods
0043a61933
Merge pull request #1268 from Doctor17-git/master
Updated ru_RU.lang
2023-12-10 20:33:20 +01:00
HbmMods
ebdd05ccde
Merge branch 'master' into master 2023-12-10 20:33:13 +01:00
Doctor17-git
c11dda67ad
Updated ru_RU.lang
updated russian localization
2023-12-10 22:28:06 +03:00
Bob
94484fe91e missing recipe 1.0.27X4809 2023-12-10 20:12:36 +01:00
HbmMods
12badf2bdd
Merge pull request #1261 from BallOfEnergy1/New_master
OpenComputers Compatibility!
2023-12-10 19:00:53 +01:00
Bob
1d92906dd7 upgrade crap, funny new stamps 2023-12-10 18:58:26 +01:00
9Valjews
be31c070a5
Update ModItems.java
The unfuckening 2: now with readded foreign languages!
2023-12-10 10:34:02 +02:00
9Valjews
4343caeb22
Update en_US.lang
The unfuckening
2023-12-10 10:27:46 +02:00
9Valjews
c64f3f5e5a anyways I think it should be fine, its just my PC being stupid 2023-12-10 10:20:16 +02:00
9Valjews
0062a2f01c Empty commit, be aware, it might break some encoding shit in other languages, I cant check it because if I compile it it will use the hebrew encoding regardless, hopefully there would be no issue when its properly compiled as its only my system compiling it like that, rather than the files being borked 2023-12-10 10:18:52 +02:00
9Valjews
07af8a683f I suffer from stupid idiot disease 2023-12-10 10:07:09 +02:00
9Valjews
5cad503fa7 A way to link radars and orbital deathrays, works, I hate Hebrew encoding it makes every little file save a 50 minute task 2023-12-10 10:01:37 +02:00
70000hp
897308cb7f e 2023-12-08 19:57:50 -05:00
70000hp
ab9f5432a5 made the tasks comprehensible 2023-12-08 18:54:15 -05:00
KoblizekXD
cc4105fc68 certified fel sound 2023-12-08 11:53:00 +01:00
KoblizekXD
56e7d2d83c add non worky code 2023-12-08 11:15:08 +01:00
70000hp
0d33363eaf an unspeakably large commit
Contains the whole fucking glyphid PR. ill tell why later
2023-12-07 19:51:26 -05:00
Boblet
5c33fa1707 finished RBMK console, more upgrade stuff 2023-12-07 16:39:20 +01:00
Bob
8dc217b5f7 i ate poisoned grilled cheeses and now i am dying 2023-12-06 20:08:24 +01:00
Bob
b69351f857 that 2023-12-05 22:13:12 +01:00
Boblet
976e0dba37 decoy missile, recipe stuff 2023-12-05 16:39:03 +01:00
Bob
1157e691d7 more exposure chamber crap 2023-12-03 20:23:51 +01:00
Bob
f8e9cff64b tweaks, exposure chamber recipes 2023-12-02 20:44:34 +01:00
BallOfEnergy
67f0183dad Merge remote-tracking branch 'origin/New_master' 2023-11-30 19:26:54 -06:00
BallOfEnergy
7376e62112 PWR Compatibility fix (i forgot a line) 2023-11-30 19:26:44 -06:00
BallOfEnergy
0765584fda
Merge branch 'HbmMods:master' into New_master 2023-11-30 18:45:48 -06:00
BallOfEnergy
d4f8de4a54 Finishing touches. 2023-11-30 18:45:13 -06:00
Bob
ace7812d3f rubber dinghy fixes, missile recipe stuff 2023-11-30 22:10:41 +01:00
BallOfEnergy
b61d92a998
Merge branch 'HbmMods:master' into New_master 2023-11-30 14:21:49 -06:00
BallOfEnergy
f00839b222 Merge remote-tracking branch 'origin/New_master' 2023-11-30 14:19:32 -06:00
BallOfEnergy
d217cfb7f3 i fucking hate github
this is to fix everything that github just broke
including removing the shit from that one PR that broke everything
2023-11-30 14:18:03 -06:00
Boblet
30a5dee40d I'M ON A BOAT 2023-11-30 15:26:49 +01:00
BallOfEnergy
5a7cd85a6b
Merge branch 'HbmMods:master' into New_master 2023-11-29 18:48:08 -06:00
Boblet
57059d6a5e exposure chamber stuff 2023-11-29 15:46:08 +01:00
BallOfEnergy
ab9db6806c Revert "jesus fine 7 here's your fucking fast conveyors"
This reverts commit 0f47e9ace0e8da9f10b9d9458bcee36b528b8b2d.
2023-11-28 22:05:37 -06:00
BallOfEnergy
3a38c71c34 oh get ready for this one
huge commit
yes i should have spread it out but
im lazy :3
2023-11-28 22:05:26 -06:00
BallOfEnergy
42bf74c464 jesus fine 7 here's your fucking fast conveyors 2023-11-28 22:04:15 -06:00
BallOfEnergy
b000105392 attempt #2 2023-11-28 22:03:38 -06:00
BallOfEnergy
b0b37223a7 oh get ready for this one
huge commit
yes i should have spread it out but
im lazy :3
2023-11-28 22:03:12 -06:00
BallOfEnergy
b9f14fd471 Merge remote-tracking branch 'origin/New_master' into New_master
# Conflicts:
#	changelog
#	src/main/java/api/hbm/entity/IRadarDetectableNT.java
#	src/main/java/api/hbm/entity/RadarEntry.java
#	src/main/java/com/hbm/handler/CompatHandler.java
#	src/main/java/com/hbm/inventory/gui/GUIMachineRadarNT.java
#	src/main/java/com/hbm/packet/BufPacket.java
#	src/main/java/com/hbm/packet/PacketDispatcher.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadar.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java
#	src/main/resources/assets/hbm/textures/gui/machine/gui_radar_nt.png
2023-11-28 21:56:20 -06:00
BallOfEnergy
c353334b21 bruh 2023-11-28 21:46:17 -06:00
BallOfEnergy
c86e52f5c0 pretty important fix where crane consoles would move 4x faster than possible 2023-11-28 21:46:17 -06:00
BallOfEnergy
533c87eb1a Large update to direct calls and limits for pulling values. 2023-11-28 21:46:15 -06:00
BallOfEnergy
dd5786bb60 Gas turbine compat!!! 2023-11-28 21:46:05 -06:00
BallOfEnergy
0f25aac3a2 back at it again with the OC compat
Now including:
Optimizations
Turbine Compat
Compat handler for general functions
other compat
2023-11-28 21:46:05 -06:00