1289 Commits

Author	SHA1	Message	Date
Boblet	2b59d8709e	PR cleanup	2022-06-24 08:16:08 +02:00
HbmMods	bf2224b880	Merge pull request #641 from Adam29Adam29/master ... Electric Furnace Rework	2022-06-24 08:10:45 +02:00
Bob	d6fc826ad8	i did nothing all day	2022-06-24 00:23:26 +02:00
HbmMods	415ea9470f	Merge pull request #634 from 7pheonix/glasscannon ... Some bullshit regarding electrically powered guns + a funky one from the depths of my imagination	2022-06-23 08:33:29 +02:00
Boblet	fde92737eb	formatting	2022-06-23 08:26:05 +02:00
HbmMods	aa9cd95681	Merge branch 'pr603' into master	2022-06-23 08:10:17 +02:00
HbmMods	c62c37efb3	Merge pull request #630 from Vaern/master ... Recipe changes, messing with nuke items; a bite-sized PR, as a treat	2022-06-23 07:58:04 +02:00
Bob	90de2eabdc	arty actually using the proper ammo types	2022-06-22 23:24:55 +02:00
Adam	5921a64c95	furnace container file	2022-06-22 21:14:47 +02:00
Adam	d7d7af3f6b	change of dualCookTime to progress	2022-06-22 21:12:25 +02:00
Adam	28f8b0be65	block furnace file	2022-06-22 21:11:05 +02:00
Adam	954839a2d1	accidental file	2022-06-22 21:09:27 +02:00
Adam	f4b0ba5bc2	added item tooltip for furnace	2022-06-22 20:58:58 +02:00
Adam	8138382c15	Tile entity Furnace file	2022-06-22 20:57:27 +02:00
Adam	580657c609	Block Furnace Textures	2022-06-22 20:55:51 +02:00
Adam	1c05d309b6	GUI Texture For Furnace	2022-06-22 20:53:57 +02:00
Adam	c380b7f84f	Merge branch 'HbmMods:master' into master	2022-06-22 20:45:04 +02:00
Boblet	aebcf90026	iron furnace fix, artillery shells	2022-06-22 16:58:48 +02:00
Bob	c98a011141	manual artillery contoller	2022-06-21 22:56:20 +02:00
Adam	093da728d2	i want to combust 2: electric boogaloo	2022-06-21 20:05:03 +02:00
Adam	905e2646ab	GUI electric furnace	2022-06-21 19:01:35 +02:00
Adam	916f295944	pain and even agony	2022-06-21 18:45:23 +02:00
Adam	c8c9d4af7e	i want to combust	2022-06-21 18:02:52 +02:00
Boblet	2952e175b5	fixes and fusion power ports	2022-06-21 16:56:51 +02:00
Bob	0a017e9672	torex tweaks	2022-06-20 22:34:47 +02:00
Adam	879741a17c	progress bar issues	2022-06-20 22:33:04 +02:00
Boblet	e1b75a315e	IO fixes, some arty work	2022-06-20 17:00:41 +02:00
Bob	86a531cebe	more arty stuff, conveyor fixes, crane retexture	2022-06-19 19:44:30 +02:00
Pheonix	b7ffa0f1d8	some garbage i almost forgot	2022-06-19 18:23:38 +01:00
Pheonix	fcfa5cee55	plentiful amounts of dosh	2022-06-19 18:11:16 +01:00
Vaern	43049bb730	Fixed the GC recipe for uranium fuel only having 2 UF nuggets, not 6	2022-06-17 12:20:31 -07:00
Vaern	af35180620	changed the recipes a lil	2022-06-17 12:05:29 -07:00
Vaern	0ba7153334	Recipe changes, messing around with nuke items, remappings and ignored	2022-06-17 12:05:29 -07:00
Boblet	e9f144bac9	a tiny bit of arty stuff	2022-06-17 15:23:12 +02:00
HbmMods	eb565f1b2f	Merge branch 'master' into GC-Rework-Pt2	2022-06-17 13:41:24 +02:00
Bob	caa6b31b93	finished iron furnace, artillery turret	2022-06-16 22:59:28 +02:00
Boblet	34d72b4f80	iron furnace, some universal code for solid fuels	2022-06-15 16:54:45 +02:00
Bob	c307d26752	iron furnace	2022-06-14 22:56:06 +02:00
Boblet	f003b2db08	some stuff™️	2022-06-14 16:59:33 +02:00
Bob	0e3be93bcb	fixed canister color + version bump	2022-06-13 17:42:19 +02:00
Boblet	c50d01fedc	fixes	2022-06-13 16:30:59 +02:00
HbmMods	ad6fe11d83	Merge pull request #626 from Doctor17-git/master ... Updated ru_RU.lang	2022-06-12 21:16:47 +02:00
Doctor17-git	8d395e1658	Updated ru_RU.lang	2022-06-12 21:55:29 +03:00
HbmMods	fa176c6a5c	Merge pull request #623 from Voxelstice/turbine-anim ... turbine blades now fade in/out when spinning	2022-06-12 20:48:58 +02:00
Bob	8c1275206c	and all that jazz	2022-06-12 20:47:20 +02:00
Voxelstice	8dfe52b895	and the large turbine	2022-06-12 05:26:14 +10:00
Voxelstice	4bd1ccddf2	chungus	2022-06-12 05:24:46 +10:00
Boblet	debb9449cb	working ejector crane upgrades	2022-06-10 15:24:46 +02:00
Bob	9a54fc537e	some crafting recipes or sth	2022-06-09 23:20:16 +02:00
Boblet	22746a54e9	spring cleaning, conveyor lift	2022-06-09 16:55:41 +02:00