966 Commits

Author SHA1 Message Date
FOlkvangrField
7473278dab More custom machine options
Add more custom machine options. Now custom machines can receive neutron flux and heat through the "Neutron Flux Receiver" and "Heat receiver" blocks within the structure. The recipe has also added corresponding configurable neutron flux and heat requirements, and can also be configured to generate/absorb contamination
2023-12-30 16:14:32 +08:00
HbmMods
c70d5bf517
Merge pull request #1267 from KoblizekXD/minor-features
FEL sound
2023-12-29 22:02:20 +01:00
HbmMods
6c0a8d10dc
Merge pull request #1266 from 9Valjew/master
Radar and Deathray linkage
2023-12-29 22:01:54 +01:00
HbmMods
1e0ad1c52b
Merge pull request #1281 from Voxelstice/oc-two
Ported the 1.12.2 RBMK console OC compat to 1.7.10 and also more PWR compat
2023-12-29 22:00:02 +01:00
Bob
ca1cd3db17 and some more fixes 2023-12-25 00:08:26 +01:00
Voxelstice
29264d206e insert something funny here 2023-12-21 14:11:01 +03:00
Boblet
f953d69ee6 spring cleaning 2023-12-20 16:40:22 +01:00
Boblet
65412f0c89 oop forgot to push this 2023-12-19 08:02:11 +01:00
Bob
0d2ab05316 some more shit idk 2023-12-17 19:42:52 +01:00
HbmMods
3d319a1b15
Merge pull request #1265 from 70000hp/just-kill-me-already
The Entire Glyphid Update
2023-12-13 10:09:53 +01:00
Bob
9448d51e02 fuck you 2023-12-10 21:15:53 +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
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
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
KoblizekXD
cc4105fc68 certified fel sound 2023-12-08 11:53:00 +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
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
7376e62112 PWR Compatibility fix (i forgot a line) 2023-11-30 19:26:44 -06:00
BallOfEnergy
d4f8de4a54 Finishing touches. 2023-11-30 18:45:13 -06: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
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
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
BallOfEnergy
42f7e7407b first commit on new shit 2023-11-28 21:46:04 -06:00
Bob
06181f08d9 yeah whatever 2023-11-26 20:27:58 +01:00
Bob
bdbb960db2 we gotta move these color TVs 2023-11-26 20:27:15 +01:00
Boblet
ba014d54f7 new radar targeting interface, second GUI, target localiaztion 2023-11-26 20:27:06 +01:00
Boblet
23a55a23a2 ABMs with SmЯt™ predictive targeting technology 2023-11-26 20:26:42 +01:00
Boblet
927abb9066 guh 2023-11-26 20:26:24 +01:00
Boblet
a28156065f nuclear blast furnace IO config 2023-11-26 20:26:13 +01:00
HbmMods
8944744142 Merge pull request #1247 from Ice-Arrow/master
Make the research reactor compatible with IC2's water changes
2023-11-26 20:26:05 +01:00
Bob
5081dccb19 tweaks, fixes, radar crap 2023-11-26 20:25:31 +01:00
Bob
353049c538 missile rewrite, terrain scan radar 2023-11-26 20:22:23 +01:00
Boblet
c47e96c3cd even more radar stuff 2023-11-26 20:20:24 +01:00