1402 Commits

Author	SHA1	Message	Date
RosaTryp	5d394bac15	Merge remote-tracking branch 'upstream/master' into machine-configs	2024-08-21 18:16:23 +02:00
Boblet	b8d24b5c2d	battery packs	2024-08-20 16:30:15 +02:00
HbmMods	0e2b7e09b6	Merge branch 'master' into OC_bugfix	2024-08-19 15:10:57 +02:00
George Paton	9ee553fe14	Fix pumpjack tank sync	2024-08-19 12:25:24 +10:00
George Paton	402d54d669	Merge branch 'HbmMods:master' into master	2024-08-19 09:17:19 +10:00
Bob	1caeec5ea9	d(err)ick	2024-08-18 21:00:27 +02:00
George Paton	f58d97c007	switch TEMachineBattery to bytebuf	2024-08-16 21:57:42 +10:00
BallOfEnergy	89c97abbdc	i looked back here and nearly had a fucking stroke from this code	2024-08-15 15:59:01 -05:00
Bob	3aef7e1577	i love to drink oil	2024-08-15 20:38:22 +02:00
BallOfEnergy	148a0ab035	whoops!!!	2024-08-14 15:29:50 -05:00
BallOfEnergy	9d0e02cc61	god finally i can get rid of this ... Removed Analyzable implementation; terrible idea Fixed long-standing bug with proxy components, more NBT data!!!	2024-08-14 15:14:08 -05:00
HbmMods	fd1bb4e28d	Merge pull request #1624 from BallOfEnergy1/OC_bugfix ... WOO!!	2024-08-13 11:21:53 +02:00
Boblet	d70ea038a0	an big slappy	2024-08-12 16:26:09 +02:00
RosaTryp	8e4d4418b6	Configuration options for ashpit, leviathan turbine and all condensers	2024-08-12 13:56:45 +02:00
BallOfEnergy	b98f2350b6	man i was stupid (fix another bug with CCGT involving starting/stopping)	2024-08-11 23:40:50 -05:00
BallOfEnergy	d8f4b32c05	shit shit shit shit i forgot something	2024-08-11 22:50:31 -05:00
BallOfEnergy	c89f1b411f	ughhhh ... ok I fixed some bugs with OC compat and added new refinery GUI (bugs were in CCGT `setThrottle()` function and the TELEX `setSendingText()`)	2024-08-11 22:02:54 -05:00
RosaTryp	bcdd522464	Added config options for industrial steam turbine	2024-08-12 01:26:20 +02:00
RosaTryp	b31105d4d1	Added config options to steam turbine	2024-08-12 00:55:26 +02:00
HbmMods	85d3ffae27	Merge pull request #1603 from RosaTryp/machine-configs ... Added config options for centrifuge	2024-08-10 23:11:29 +02:00
Bob	4aa87bc009	just fuck em	2024-08-07 00:11:18 +02:00
Bob	9ebcab3244	fixes, plushies	2024-08-05 00:47:32 +02:00
Bob	f97076bb94	guh	2024-08-02 23:43:19 +02:00
RosaTryp	8aebde12bb	Added config options for centrifuge	2024-07-30 22:37:51 +02:00
Bob	44585d3c8b	baa	2024-07-24 13:31:25 +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	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
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
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	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	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