2599 Commits

Author SHA1 Message Date
70000hp
90d552c03a the power of friendship isn't working anymore
I need to kill this motherfucker
2024-08-03 19:26:15 -04:00
70000hp
492d6520ae Merge branch 'master' into more-more-qol 2024-08-03 17:23:35 -04:00
HbmMods
522c4e1b24
Merge pull request #1608 from MellowArpeggiation/master
Accurate collision geometry on chemplant and assembler
2024-08-03 13:14:46 +02:00
Bob
aaaaac92eb fixes, recipe changes 2024-08-03 13:11:14 +02:00
George Paton
18e1542663 fuck you *adjusts your collision* 2024-08-03 19:12:30 +10:00
Bob
f97076bb94 guh 2024-08-02 23:43:19 +02:00
70000hp
d379e1e3a0 Merge branch 'master' into more-more-qol 2024-07-28 12:11:15 -04:00
Bob
44585d3c8b baa 2024-07-24 13:31:25 +02:00
70000hp
ef586c78c0 Merge branch 'master' into more-more-qol 2024-07-20 20:28:21 -04:00
70000hp
164ec9a192 Settings tool and first impl 2024-07-20 20:28:13 -04:00
Boblet
8e767e51e3 ultra shit sounds 2024-07-19 11:56:38 +02:00
Boblet
8a200a50bd better particle spawner structure, killed off boilers 2024-07-18 16:04:41 +02:00
Boblet
b3047c875e welcome to super cancer world 2024-07-17 16:38:05 +02:00
Boblet
efee0706af you can, in fact, wire a WIAJ into a particle renderer 2024-07-17 10:37:12 +02:00
Boblet
83f8c5a7f9 why 2024-07-16 16:30:03 +02:00
Boblet
02c9582b21 fuck, whatever 2024-07-15 14:29:53 +02:00
Boblet
f8465b5071 flixes 2024-07-15 13:11:13 +02:00
Bob
7896c0443a the death of RNG 2024-07-14 20:48:35 +02:00
HbmMods
eaaa78c384
Merge pull request #1584 from FOlkvangrField/Configurable-Converter
Added conversion ratio configuration options for Rf and He in hbmMachines.json for the two converters
2024-07-14 13:37:35 +02:00
Bob
e7428fb5ab camera, lights, action 2024-07-14 13:35:28 +02:00
FOlkvangrField
d17b1cb4f0 Added conversion ratio configuration options for Rf and He in hbmMachines.json for two converters 2024-07-14 19:18:49 +08:00
Boblet
01830fd877 as straightforward as the nordring 2024-07-12 14:56:47 +02:00
HbmMods
9b0bd4d180
Merge pull request #1576 from 70000hp/electrolyzer-electric-boogaloo
Electrolyzer improvements part 2
2024-07-11 16:06:06 +02:00
Boblet
28e1fdd7f5 cleanup 2024-07-11 16:05:25 +02:00
70000hp
301a932257 cant win with friends and family 2024-07-11 09:48:51 -04:00
70000hp
7f666ecaff Fixed items with meta not working + mass storage support 2024-07-10 13:38:45 -04:00
70000hp
d4e9a5d010 Autocrafter uncluttering and drag drop support 2024-07-10 13:02:30 -04:00
70000hp
851d6fb0bf Merge branch 'master' into NEI-schenanigans 2024-07-10 12:16:45 -04:00
Boblet
ef228577d9 the heinous slop 2024-07-10 16:33:33 +02:00
70000hp
8c7b359815 all my homies hate dust 2024-07-09 12:35:01 -04:00
Boblet
27bc38caaa NEI universal handler fix 2024-07-09 16:17:23 +02:00
Bob
962686d29e blerp 2024-07-08 22:41:47 +02:00
HbmMods
958a099bac
Merge pull request #1571 from 70000hp/electrolyzer-improvements
Electrolyzer Improvements part 1
2024-07-08 21:39:57 +02:00
Boblet
ae995509e5 recipe tweaks 2024-07-08 16:56:14 +02:00
70000hp
3120268a64 Electrolyzer Improvements part 1
Changes:
Halfed recipe time for water/heavy water electrolysis
Added ore slop electrolysis recipe
Added electrolyzer overdrive support
Rebalanced the power savings upgrade
speed and overdrive upgrades now make the electrolyzer pour out faster
2024-07-08 10:16:15 -04:00
Boblet
b31cb80fa3 tweaks 2024-07-05 15:25:04 +02:00
Boblet
bcaeeab194 the funny 2024-07-04 16:04:37 +02:00
Boblet
49bfc216e6 shit nobody asked for 2024-07-03 16:10:45 +02:00
HbmMods
f3e354174a
Merge pull request #1568 from BallOfEnergy1/OC_bugfix
sowwy bob
2024-07-02 14:31:58 +02:00
Boblet
2eb341ee33 well that was a massive waste of time 2024-07-02 14:31:12 +02:00
BallOfEnergy
ee32fff9be
Change default config value
100 -> 200
2024-07-02 03:20:24 -05:00
BallOfEnergy
604849c3a7
Merge branch 'HbmMods:master' into OC_bugfix 2024-07-02 02:44:50 -05:00
BallOfEnergy
867827f3a3 Merge remote-tracking branch 'origin/OC_bugfix' into OC_bugfix 2024-07-02 02:44:20 -05:00
BallOfEnergy
e1226c94be sowwy 2024-07-02 02:44:06 -05:00
Boblet
34fbf2ecbe the partitioning 2024-07-01 14:10:54 +02:00
Bob
7d1aeb378b yeah whatever 2024-06-30 18:56:27 +02:00
Bob
b111b0cff8 the slop consumes 2024-06-30 16:03:23 +02:00
HbmMods
2be3c60e59
Merge pull request #1557 from 70000hp/drone-stuffs
Drone stuffs
2024-06-30 10:13:08 +02:00
George Paton
17bee07c88 Add ILookOverlay to Solar Boiler and sync tank levels to connected clients 2024-06-30 13:15:10 +10:00
70000hp
1f4ad4bdfe Adding mellow's nice little helper function
Also includes the conveyor extractor implementing it as a reference
2024-06-29 19:28:37 -04:00