4250 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
BallOfEnergy	aceb313fec	Merge remote-tracking branch 'refs/remotes/upstream/master' into Optimization ... # Conflicts: # src/main/java/com/hbm/handler/WeaponAbility.java # src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java # src/main/java/com/hbm/tileentity/TileEntityLoadedBase.java # src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java	2025-02-09 18:02:29 -06:00
BallOfEnergy	352cee350f	Merge remote-tracking branch 'origin/Optimization' into Optimization	2025-02-09 18:01:03 -06:00
BallOfEnergy	e2d64ff376	Fix for main issue #1933.	2025-02-09 18:00:52 -06:00
Bob	5341f5d255	EOTT	2025-02-09 18:38:30 +01:00
Bob	f74ce297f8	chromatic aberration	2025-02-08 23:19:33 +01:00
Boblet	b60db5b911	pain	2025-02-06 16:48:29 +01:00
HbmMods	fe9808f621	Merge pull request #1924 from Dash1269/ntmain-pa-detector-fix ... PA Detector fixes and improved diagnostics	2025-02-06 15:00:30 +01:00
Boblet	8522b584d4	undo all of the PA stuff	2025-02-06 15:00:19 +01:00
Dosh	5f1a4509f2	PA Detector fixes and improved diagnostics	2025-02-07 00:08:31 +11:00
Boblet	bd59ae5970	flixes	2025-02-05 16:45:49 +01:00
HbmMods	d4d5340a33	Merge pull request #1920 from Creeper-banner/bob ... Update zh_CN.lang for X5230	2025-02-05 11:17:02 +01:00
Creeper-banner	2f2c2438d5	Add files via upload	2025-02-05 17:47:58 +08:00
HbmMods	d363177e7f	Merge pull request #1917 from TheCrazyInsanity/master ... Simple Github action to build on push & pr	2025-02-05 08:06:21 +01:00
HbmMods	1f5c58b7bb	Merge pull request #1914 from Nycticoraxnightheron/master ... zh_CN update	2025-02-05 08:04:42 +01:00
Boblet	27bd64eafc	a botched nosejob	2025-02-04 16:54:02 +01:00
TheCrazyInsanity	4b32e2665b	I forgot to make it upload artifacts ... :3c	2025-02-03 18:01:30 -05:00
TheCrazyInsanity	7206cad26a	Create build.yml ... Github actions template to build an artifact on push or pr	2025-02-03 17:50:45 -05:00
Boblet	a814e581b9	time to eat 40lbs of dynamite then die 1.0.27_X5230	2025-02-03 16:24:41 +01:00
Night Heron	3b1a578d71	I hate eszopiclone	2025-02-03 14:57:30 +08:00
Bob	6027ad963b	fuck off	2025-02-02 22:05:58 +01:00
HbmMods	201689942a	Merge pull request #1905 from 70000hp/Aluminium-fifth-attempt-at-merging ... Aluminium 2 1.0.27_X5229	2025-02-02 17:29:49 +01:00
HbmMods	26a2a46958	Merge pull request #1910 from Creeper-banner/bob ... Update zh_CN.lang	2025-02-02 17:25:19 +01:00
Bob	0e0777f196	the rim flappe on a bongfish is mated to the bungus of its fuccbone. ... the scrotewad is onyl present on females above the pootsack (see: snogbag).	2025-02-02 17:21:34 +01:00
70000hp	32d6a59991	Update ElectrolyserFluidRecipes.java	2025-02-01 11:43:27 -05:00
Creeper-banner	232c626c31	Add files via upload	2025-02-01 15:04:19 +08:00
Creeper-banner	b4a7d5a197	Merge branch 'HbmMods:master' into bob	2025-02-01 14:04:49 +08:00
70000hp	dd84cf8f7c	ratio engoodening 2 + fluorite instead of aluminium powder	2025-01-31 12:29:42 -05:00
Boblet	98aea38025	hey lois look i'm a commit message	2025-01-31 15:24:14 +01:00
Boblet	d8ab0e7ecf	1000 lines of code	2025-01-30 16:01:05 +01:00
70000hp	4e28272444	eh why not	2025-01-29 17:04:30 -05:00
70000hp	6e3e702213	my bones	2025-01-29 16:32:23 -05:00
Boblet	691ff5c1d5	floppotron	2025-01-29 16:37:12 +01:00
Bob	a074a4a249	the escape plan 1.0.27_X5224	2025-01-28 23:24:40 +01:00
Boblet	bc3e643f97	a touch too much	2025-01-28 16:37:59 +01:00
Boblet	03639e2cdb	i'm just gonna call this "gock" with no further context	2025-01-28 13:15:41 +01:00
Boblet	841864e368	the blombus	2025-01-27 16:55:41 +01:00
HbmMods	64f5bbe4bb	Merge pull request #1891 from t3435ryt/oc-compat ... Add OpenComputers Compatibility for Combustion Engine 2	2025-01-27 08:24:03 +01:00
HbmMods	3649ed45cf	Merge pull request #1894 from MellowArpeggiation/master ... Fix foundry channel clogs	2025-01-27 08:21:50 +01:00
George Paton	e65a98421f	handle shovels and prevent any unforeseen issues (like if a channel gets separated by breaking/explosion)	2025-01-27 10:13:11 +11:00
Bob	15645648c5	sharticle accelerator	2025-01-26 22:09:21 +01:00
George Paton	8634d63625	Prevent contiguous foundry channels from accepting different materials until fully emptied, preventing clogs	2025-01-26 12:31:35 +11:00
Bob	fb1e20c11f	🅱️all 🅱️usting	2025-01-25 20:25:01 +01:00
t3435ryt	0222ebfaf9	Fix stupidity	2025-01-24 20:42:44 -05:00
t3435ryt	1274fdcbac	Add OpenComputers Compatibility for Combustion Engine	2025-01-24 20:09:36 -05:00
Boblet	02d749bdb1	spread it	2025-01-24 14:57:21 +01:00
Boblet	11e96c08c0	porting of the ports	2025-01-23 16:49:42 +01:00
Boblet	31eeb2ab94	heaven sent & hell bent	2025-01-22 16:55:52 +01:00
Boblet	4024249bec	deplorable gollompus	2025-01-21 16:44:09 +01:00
Boblet	c03801f3af	killing myself (flirting)	2025-01-20 16:28:35 +01:00
HbmMods	2d007e836f	Merge pull request #1873 from Agarmal/OpenComputers-Better-Integration ... Add vent carbon dioxide function in Zirnox for OpenComputers	2025-01-20 08:10:37 +01:00