3013 Commits

Author SHA1 Message Date
Voxelstice
6461a4c415 fix inverted door redstone 2023-12-19 21:30:20 +03:00
Boblet
65412f0c89 oop forgot to push this 2023-12-19 08:02:11 +01:00
Bob
c6d43a6215 model fix 2023-12-17 21:49:38 +01:00
Bob
0d2ab05316 some more shit idk 1.0.27X4816 2023-12-17 19:42:52 +01:00
HbmMods
46a5f82e08
Merge pull request #1277 from HbmMods/pr1265
Pr1265
2023-12-17 17:44:20 +01:00
Bob
5af5c6c861 more shit to clean up 2023-12-17 17:42:42 +01:00
Bob
3416dbe14f fancier glyphid hives, maggots 2023-12-16 18:24:43 +01:00
Boblet
95520daebc moldy glyphids 2023-12-15 14:25:44 +01:00
Boblet
debfa0f3ee better spawner behavior, digger glyphid 2023-12-14 16:36:10 +01:00
Boblet
31c55c7cfa now i know how megan feels 2023-12-13 15:12:28 +01:00
Boblet
8a59eb9dbc initial cleanup 2023-12-13 11:08:01 +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
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
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
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