xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,079 Commits 17 Branches 299 Tags
Commit Graph

3079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
KoblizekXD
4af44b880d fix: fix problematic sounds (minor skill issue) 2023-11-27 11:18:39 +01:00
KoblizekXD
862488d421 feat: add recipes for ass embler 2023-11-27 11:18:27 +01:00
KoblizekXD
d376f293be feat: add translations(pls work) 2023-11-27 11:18:17 +01:00
KoblizekXD
51ee74a418 feat: WE LOVE DOORS 2023-11-27 11:18:08 +01:00
KoblizekXD
0f082285cf feat: add secure access doors from 1.12.2 fork 2023-11-27 11:17:49 +01:00
Bob
cb0557170c small fix 2023-11-26 20:56:09 +01:00
HbmMods
d240b2ee8b Merge pull request #1254 from Doctor17-git/master 
Updated ru_RU.lang
 2023-11-26 20:28:07 +01: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
Bob
e40343b6dd crunchier tier 1 missiles 2023-11-26 20:26:51 +01:00
Boblet
23a55a23a2 ABMs with SmЯt™ predictive targeting technology 2023-11-26 20:26:42 +01:00
Bob
b6f9953b3e *blows up missile with mind* 2023-11-26 20:26:37 +01:00
Boblet
7323fe31da more missile fun 2023-11-26 20:26:31 +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
1bc94c989b finally checking this off my bucket list 2023-11-26 20:21:49 +01:00
Boblet
45fe9a81b2 MINE THE NITRA FOR AMMO 2023-11-26 20:21:41 +01:00
Boblet
c47e96c3cd even more radar stuff 2023-11-26 20:20:24 +01:00
HbmMods
089b390708 Merge pull request #1242 from JameH2/hbm 
The Convenience Store
 2023-11-26 20:20:16 +01:00
Boblet
64c53be869 more radar crap 2023-11-26 20:19:27 +01:00