3003 Commits

Author SHA1 Message Date
Doctor17-git
2703c43365
Updated ru_RU.lang 2024-05-05 10:59:44 +03:00
Doctor17-git
d106b0205e
Updated ru_RU.lang
updated russian localization
2024-04-14 18:15:26 +03:00
Doctor17-git
726d277829
Updated ru_RU.lang
updated russian localization
2024-02-18 20:24:05 +03:00
Doctor17-git
37dd5836c6
Updated ru_RU.lang
h2
2024-02-12 15:44:19 +03:00
Doctor17-git
662c81b26f
h2 2024-02-03 11:10:47 +03:00
Doctor17-git
a1208f6ebd
h 2024-02-03 10:44:54 +03:00
Doctor17-git
1b21c87daf
Updated ru_RU.lang
updated russian localization
2024-02-03 10:11:50 +03:00
Doctor17-git
7b6a9ffa60
h 2024-01-15 17:54:02 +03:00
Doctor17-git
873810965d
Updated ru_RU.lang
updated russian localization
2024-01-15 17:52:28 +03:00
Doctor17-git
c2fb48cb59
Updated ru_RU.lang
updated russian localization
2024-01-09 13:15:07 +03:00
Doctor17-git
13808fa5e7
Updated ru_RU.lang
updated russian localization
2023-12-25 10:38:39 +03: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
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
sdddddf80
34865547c4 Transferred a bunch of text to lang file
Transferred a bunch of text to lang file(not all)
2023-11-28 21:46:04 -06:00
JameH2
6bc0a2de4a wow i cant believe you forgot these kill yours 2023-11-28 21:46:04 -06:00
JameH2
b311525574 ribbit 2023-11-28 21:46:04 -06:00
BallOfEnergy
42f7e7407b first commit on new shit 2023-11-28 21:46:04 -06:00
Boblet
8fac493947 post merge fixes, radar-launchable custom missiles, more stuff 2023-11-27 16:00:19 +01:00
KoblizekXD
f84696714a *sound* 2023-11-27 11:18:54 +01:00