831 Commits

Author SHA1 Message Date
Bob
0fdfae999e hey shitass, stop fucking with my gitignore 2023-07-19 14:45:32 +02:00
HbmMods
0efb99b78c
Merge pull request #1117 from BallOfEnergy1/ocshit
Added OC compatibility to yet another block (more coming soon)
2023-07-19 11:17:22 +02:00
Bob
4c3047c121 glaggle 3: return to blibble's field 2023-07-19 11:15:42 +02:00
BallOfEnergy
8d22bda8fb fix the OC part where I18nUtil was being called (no longer is it being called) 2023-07-18 20:45:54 -05:00
BallOfEnergy
c1896aa4fb
Merge branch 'HbmMods:master' into master 2023-07-18 20:39:36 -05:00
BallOfEnergy
02e1ae5fbc Revert "RBMK redstone column that doesn't work (will work eventually)"
This reverts commit 424d6c3486d0c5ffb4d7e9f7d951c026ba48f7fb.
2023-07-18 20:34:59 -05:00
BallOfEnergy
3041e68896 there you got your damn comparator support for tanks 2023-07-18 20:27:41 -05:00
Bob
ecec7e5a36 the malicious gigglefish from the silly dimension 2023-07-18 18:34:16 +02:00
BallOfEnergy
949b4ae66a
Merge branch 'HbmMods:master' into master 2023-07-17 14:17:53 -05:00
Bob
ea8dcd9508 tweaks and fixes, template crate 2023-07-15 22:30:49 +02:00
BallOfEnergy
424d6c3486 RBMK redstone column that doesn't work (will work eventually) 2023-07-13 23:39:04 -05:00
Bob
18a1b103ba some pistol tweaks, compressor fix, cryo cannon texture 2023-07-10 21:38:41 +02:00
Bob
b443c3449d fuck you fuck you fuck you fuck you fuck you fuck you fuck you fuck you 2023-07-09 19:46:38 +02:00
Bob
925236e538 iboiler texture, coilgun, bunch of fixes, recipes 2023-07-09 17:28:11 +02:00
Bob
bc8dfcaa99 coolers 2023-07-06 20:48:25 +02:00
Bob
25a7a6c345 new multiblock sys for assembler 2023-07-05 22:42:36 +02:00
Bob
5f109b61ec i can't feel my limbs 2023-07-05 22:26:20 +02:00
Bob
4ad28d25f4 industrial boiler 2023-07-04 22:12:10 +02:00
Bob
843efd575e some train stuff 2023-07-02 18:59:47 +02:00
Bob
65ed6a4f9a helium 4 plasma 2023-07-01 21:43:29 +02:00
HbmMods
738e698d72
Merge pull request #1096 from HbmMods/pr1083
Pr1083
2023-07-01 20:27:59 +02:00
Bob
8bc1f73075 big smoke 2023-07-01 19:19:09 +02:00
Boblet
fcfa725f0b pipable exhaust 2023-06-30 11:57:28 +02:00
HbmMods
4f67d5b11f
Merge branch 'pr1083' into master 2023-06-30 07:56:09 +02:00
Bob
7c1d5bd3e3 fixes, localization, chimney 2023-06-29 20:59:13 +02:00
Boblet
61132bd310 I REMBER 2023-06-29 16:08:32 +02:00
Bob
cd12d6d9af configs configs, glyphid meat, yummy yummy fruit salad 2023-06-28 22:05:29 +02:00
Bob
0ac2445329 i'll fucking shoot somebody 2023-06-26 19:52:36 +02:00
Toshayo
28c43462f1
Merge remote-tracking branch 'HbmMods/master' 2023-06-26 19:25:49 +02:00
Bob
99cfce0e5d pollution effects for heavy metal and poison 2023-06-24 17:54:46 +02:00
Boblet
bb15f50047 pressure requirement for recipes 2023-06-23 11:17:37 +02:00
Toshayo
39b2d394f9
Merge remote-tracking branch 'HbmMods/master' 2023-06-22 21:38:17 +02:00
Bob
ff4b231be2 more compressor stuff 2023-06-22 21:02:19 +02:00
Toshayo
5c9f78f8a2
Merge remote-tracking branch 'HbmMods/master'
# Conflicts:
#	changelog
2023-06-22 19:07:48 +02:00
Boblet
d6cdc69c89 pressure 2023-06-22 14:59:54 +02:00
Toshayo
73987a5b1c
Merge remote-tracking branch 'HbmMods/master' 2023-06-22 14:45:15 +02:00
Toshayo
0be6b66446
Improved satellite loot system again so lunar loot is in lunar satellite and not in random class 2023-06-22 09:01:09 +02:00
Bob
ee7c10174a compressor recipes 2023-06-21 21:47:20 +02:00
Boblet
f17a1280d7 welded fusion reactor magnets 2023-06-19 16:22:03 +02:00
Bob
f2886ea33e spicy himars ammo, more glyphid crap, compressor work 2023-06-18 20:11:36 +02:00
Boblet
4cd26174fb more pollution, igen defuckening part 4 2023-06-13 16:30:46 +02:00
HbmMods
dd8005f60f
Merge pull request #1070 from BallOfEnergy1/master
Minor addition in pollution code. (clamping values)
2023-06-13 09:54:39 +02:00
Boblet
1c7d8e41f0 leaded fuel pollution 2023-06-13 09:54:26 +02:00
BallOfEnergy
506a70a413 geiger counter OC compat 2023-06-11 23:26:53 -05:00
BallOfEnergy
3ab84d4f8a Percentage my beloved 2023-06-11 22:31:53 -05:00
BallOfEnergy
b9c2371848 Small changes to Boiler callback code following the change with OC and string returns. 2023-06-11 21:52:31 -05:00
HbmMods
e3669f51d0
Merge pull request #1067 from BallOfEnergy1/master
Extended OC Compatibility along with a minor bugfix
2023-06-11 17:02:52 +02:00
Bob
41648d4f68 fixes, rail stuff 2023-06-11 17:01:33 +02:00
BallOfEnergy
c050e099af Urgent: getInfo function for fuel rods was fucked, and returned an unknown error when invoked. Fixed in this commit. 2023-06-10 22:30:15 -05:00
BallOfEnergy
14d11cef7f added some stuff, removed some useless and stupid things 2023-06-10 21:57:52 -05:00