5734 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Yannick Marcotte-Gourde	42f66bb768	NEI manual offset fix (#138) ... Co-authored-by: Martin Robertz <dream-master@gmx.net>	2024-12-15 10:48:02 -06:00
Martin Robertz	802f5fc7fc	update	2024-12-14 21:03:09 +01:00
charagarlnad	28fe621d5f	use buffer in LuaStateFactory file comparison (#137)	2024-12-14 15:38:59 +01:00
Martin Robertz	552dc470d4	update	2024-11-09 20:03:21 +01:00
Martin Robertz	05566db842	Merge pull request #136 from GTNewHorizons/soundfix ... Shorten Computer Running whitenoise	2024-11-09 00:59:08 +01:00
BlueHero233	67aa5891d0	Shorten Computer Running whitenoise	2024-11-08 17:11:19 -03:00
HfSr	1e170bd9ef	update zn_CN translation (#3737)	2024-09-21 11:45:37 +02:00
Martin Robertz	3077322eaf	update	2024-09-21 10:33:18 +02:00
Martin Robertz	41105d8749	Merge pull request #135 from asiekierka/gtnh-oc-1.8.6 ... update to OpenComputers 1.8.6	2024-09-21 09:04:44 +02:00
Adrian Siekierka	2a55563f66	Merge branch 'master-MC1.7.10' into gtnh-oc-1.8.6	2024-09-21 07:22:26 +02:00
Adrian Siekierka	b0b022a02e	OpenComputers 1.8.6 1.7.10-forge/1.8.6	2024-09-21 07:16:47 +02:00
Adrian Siekierka	a8ca37c55a	fix #3735	2024-09-21 07:07:20 +02:00
Martin Robertz	82a2a04a49	update	2024-09-20 16:01:30 +02:00
Martin Robertz	4a356a7bc4	Merge pull request #134 from GTNewHorizons/feature/fluiddrop ... add compat for ae2fc fluid drop content	2024-09-20 16:00:55 +02:00
Martin Robertz	c4b171d067	update	2024-09-20 15:52:10 +02:00
Glease	4584f64211	add compat for ae2fc fluid drop content	2024-09-20 20:48:33 +08:00
boubou19	67fb7f5721	Merge pull request #133 from GTNewHorizons/rename ... bump gt, rename	2024-09-03 16:53:35 +02:00
NotAPenguin	3496a9c451	bump gt, rename	2024-09-03 16:34:10 +02:00
Martin Robertz	a8e7b87020	update	2024-08-31 11:17:25 +02:00
Martin Robertz	806ceb4c46	Merge pull request #131 from Engineer12798/feat/more-reactor-utils ... Updated redstone port to allow for getting slot info.	2024-08-31 05:19:15 +02:00
Martin Robertz	8df01ecb91	Merge branch 'master' into feat/more-reactor-utils	2024-08-30 15:40:25 +02:00
Martin Robertz	ec38f4ec2e	Merge pull request #132 from Vlamonster/patch-1 ... Return reason for failed request	2024-08-30 15:40:13 +02:00
Julia	d177f1299a	Return reason for failed request	2024-08-30 00:29:24 +02:00
Engineer12798	c4711db4a7	Merge branch 'master' into feat/more-reactor-utils	2024-08-28 09:32:33 -04:00
Martin Robertz	44251d8fc4	update	2024-08-26 08:04:56 +02:00
Engineer12798	07875b15f7	Updated redstone port to allow for getting slot info.	2024-08-25 22:58:02 -04:00
Martin Robertz	8bcd75a1a9	Merge pull request #130 from MightyPirates/master-MC1.7.10 ... fix string.format() omission in OpenOS package.lua (#3731)	2024-08-24 22:48:50 +02:00
qq	49ae4fe850	fix string.format() omission in OpenOS package.lua (#3731)	2024-08-23 21:22:36 +02:00
Martin Robertz	ad31f5becd	update	2024-08-17 22:40:46 +02:00
Martin Robertz	4d11cec1a2	Merge pull request #129 from FireWarrior2/FireWarrior2-patch-1 ... Rename OC APUs	2024-08-17 20:45:43 +02:00
Александр	28c837ca6a	Update en_US.lang ... Fixes https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/16962	2024-08-11 18:52:53 +03:00
Dream Master	51cbefed10	update	2024-08-05 15:36:52 +07:00
Ven	14403ece6f	Add missing @SideOnly marker (#128)	2024-08-05 09:32:18 +01:00
Martin Robertz	fee3f2868d	Merge pull request #127 from Demiu/master ... Adjust to AE2 api changes	2024-07-31 00:57:48 +07:00
Dream Master	2cea502944	update	2024-07-31 00:48:39 +07:00
Dream Master	37ab7f2783	update	2024-07-31 00:20:10 +07:00
Dream Master	8e1c98dfc7	update	2024-07-30 23:49:01 +07:00
Dream Master	26abe7d634	update	2024-07-30 23:48:26 +07:00
Demiu	4bcfb14fa4	Adjust to AE2 api changes	2024-07-26 21:49:56 +02:00
Dream Master	2cb4be5994	update	2024-07-14 00:04:33 +07:00
Martin Robertz	e3fa228859	Merge pull request #126 from Engineer12798/feat/reactor-heat-storage ... IC2: Add converter for reactor components to get stored heat.	2024-07-11 13:23:27 +07:00
Engineer12798	5c3cc8e736	Merge remote-tracking branch 'refs/remotes/origin/master' into feat/reactor-heat-storage	2024-07-10 19:24:51 -04:00
Engineer12798	65a653f910	Revert "Add converter for heat storing IC2 reactor components." ... This reverts commit 97a0922bea3224a41072d443c4989c538333c348.	2024-07-10 19:21:12 -04:00
Engineer12798	4ba797d5bf	Revert "Fixed issue with getting heat from GT Cells due to creative decision regarding canStoreHeat" ... This reverts commit dd69c680e52e66d7a2b2f4dd3062e883584788d4.	2024-07-10 19:21:12 -04:00
Engineer12798	64505555f9	Add getSlotInfo to reactor driver, to get item heat.	2024-07-10 11:01:20 -04:00
Martin Robertz	6b9b22c375	Merge pull request #125 from Georggi/addFasterAENetworkAccess ... AE2: Added a faster method to filter items from ME network	2024-07-09 21:53:01 +07:00
Martin Robertz	2b208f58ba	Merge branch 'master' into addFasterAENetworkAccess	2024-07-09 21:45:16 +07:00
Dream Master	662e421238	update	2024-07-09 21:33:39 +07:00
Engineer12798	dd69c680e5	Fixed issue with getting heat from GT Cells due to creative decision regarding canStoreHeat	2024-07-08 23:57:27 -04:00
Engineer12798	97a0922bea	Add converter for heat storing IC2 reactor components.	2024-07-08 23:54:13 -04:00