5203 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Martin Robertz	299e02ee69	Merge pull request #32 from repo-alt/master-MC1.7.10 ... Bee keeper robot upgrade	2021-09-17 22:02:02 +02:00
repo_alt	ccdd480453	fixed species converter not being registered for bees ... also simplified generic forestry converter	2021-09-15 01:21:43 +03:00
repo_alt	17cfaf5e40	added species favorite temperature and humidity info	2021-09-14 23:23:15 +03:00
repo_alt	772d327edc	analyze fixed and API changed to use selected slot	2021-09-14 17:45:27 +03:00
repo_alt	3311876b48	Bee keeper robot upgrade ... https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/8467	2021-09-14 01:08:43 +03:00
DreamMasterXXL	bc0748f0b3	bump version	2021-08-16 23:22:11 +02:00
Martin Robertz	1ef1139056	Merge pull request #31 from repo-alt/master-MC1.7.10-original ... Master mc1.7.10 original	2021-08-16 21:23:21 +02:00
repo-alt	43ca1c1685	Merge branch 'master-MC1.7.10' into master-MC1.7.10-original	2021-08-16 22:22:43 +03:00
repo_alt	2fdb0e6026	Merge branch 'master-MC1.7.10' of https://github.com/MightyPirates/OpenComputers into master-MC1.7.10-original	2021-08-16 22:17:12 +03:00
Martin Robertz	7a648d1d15	Merge pull request #30 from D-Cysteine/master-MC1.7.10 ... Update Forestry version	2021-08-15 10:13:25 +02:00
D-Cysteine	e6527330d7	Update Forestry version	2021-08-14 19:05:41 -06:00
Martin Robertz	30d6615c99	Merge pull request #29 from D-Cysteine/master-MC1.7.10 ... Add dimension to machine position debug statements	2021-07-25 22:39:24 +02:00
D-Cysteine	19e66fe35e	Add dimension to machine position debug statements	2021-07-24 19:50:27 -06:00
Martin Robertz	20219b42ba	Merge pull request #27 from repo-alt/master-MC1.7.10 ... Make fluid transfer speed configurable	2021-06-03 11:27:25 +02:00
repo_alt	8d357101c7	Make fluid transfer speed configurable ... https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/7919	2021-06-02 16:41:10 +03:00
payonel	e38c3fd308	check tag info for bucket compare on remove	2021-05-14 19:01:11 -07:00
payonel	acd384b7b7	refactor generator upgrade for robustness	2021-05-14 17:41:19 -07:00
payonel	278e7bdbef	add address key check in item Delegator to limit max stack size to 1 ... closes #3226	2021-05-13 05:44:19 -07:00
payonel	ff3c2f51a9	implement getInventoryStackLimit for Disassembler to limit transfers from the transposer (and other possible api calls) ... closes #3247	2021-05-12 19:10:38 -07:00
payonel	41a6b8ac96	generator fixes and change in behavior ... 1. insert now puts a single container back in the inventory. this is not fully ic2 fuel cell compatible, you'll lose fuel cells. :) 2. remove requires container if fuel has container type 3. count returns 2nd value, the item name closes #3391	2021-05-12 09:22:40 -07:00
payonel	4a50b50725	fix raw set fg and bg methods for row, col, and even the color fields. closes #3401	2021-05-12 07:21:54 -07:00
payonel	90be0181bc	args drop returns scala iterator, no need to cast again, toArray will work ... closes #3159	2021-05-11 13:03:41 -07:00
payonel	a1d1834597	seems onLoaded from ic2 can call oc before traits are ready. this probably closes #3187	2021-05-11 09:33:36 -07:00
payonel	9bb7b69528	allow orphaned coroutines to function. they could be referenced in detached threads. closes #3423	2021-05-11 09:08:12 -07:00
Guilherme Puida	1a9feabed7	pt_BR translation update	2021-05-11 08:31:29 -07:00
payonel	7928f0c67f	fix remote terminal missing causing null exception. closes #3249	2021-05-11 08:10:39 -07:00
Fingercomp	59fac9b4b6	Check the channel is set before submitting it to the TCPNotifier	2021-05-10 14:41:51 -07:00
Martin Robertz	d972b29a78	Merge pull request #26 from GTNewHorizons/add-ic2-teleporter-driver ... add abilety to change ic2 teleporter coords	2021-01-29 20:17:25 +01:00
DreamMasterXXL	b61475b23d	fix name	2021-01-29 20:15:44 +01:00
korneel vandamme	034ff8190c	add abilety to change ic2 teleporter coords	2021-01-26 22:12:04 +01:00
repo-alt	aa997512dc	Merge pull request #25 from repo-alt/master-MC1.7.10 ... Dire Autocrafting table support	2021-01-24 19:45:16 +03:00
repo_alt	334253061d	Dire Autocrafting table support	2021-01-24 19:42:26 +03:00
PrismaticYT	00b8d190fb	Fix five-year-old typo ... (cherry picked from commit f74d7d230eac640b080774b6bf8dc02b3cfde30c)	2021-01-18 17:40:03 +01:00
repo-alt	05c702c0d6	Merge pull request #24 from repo-alt/master-MC1.7.10 ... fixed AE network iterator being unsafe	2021-01-11 21:49:39 +03:00
repo_alt	6a062f1821	fixed AE network iterator being unsafe if the network changes when iterating (iteration may not fit in one tick, even if not suspended) ... updated AE dependency	2021-01-11 21:45:43 +03:00
repo-alt	2eed2f5573	Merge pull request #23 from repo-alt/master-MC1.7.10 ... AE itemstack size may be larger that int	2021-01-01 22:00:18 +03:00
repo_alt	5f03fd3696	AE itemstack size may be larger that int	2021-01-01 21:48:25 +03:00
repo-alt	572e9d179a	Merge pull request #22 from repo-alt/master-MC1.7.10 ... Added geolyzer function to get underground oil info	2021-01-01 16:16:33 +03:00
repo_alt	4797485dc2	Added geolyzer function to get underground oil info ... updated GT and EIO references	2021-01-01 16:12:58 +03:00
repo-alt	8d81073eca	Merge pull request #21 from repo-alt/master-MC1.7.10 ... Network items iterator	2020-11-18 00:57:52 +03:00
repo_alt	2dc597d21f	Network items iterator	2020-11-18 00:55:20 +03:00
repo-alt	f3c861b14e	Merge pull request #20 from repo-alt/master-MC1.7.10 ... Apparently blood orb may have null NBT	2020-11-15 23:33:08 +03:00
repo_alt	b41f3bf283	Apparently blood orb may have null NBT	2020-11-15 23:31:38 +03:00
Martin Robertz	dea93bd5e8	Merge pull request #19 from glowredman/master-MC1.7.10 ... Add some localizations	2020-10-11 12:15:17 +02:00
glowredman	2b109f1349	Add some localizations	2020-10-11 02:16:23 +02:00
repo-alt	262a61df4c	Merge pull request #18 from repo-alt/master-MC1.7.10-original ... Wand aspect list display added	2020-10-01 04:50:14 +03:00
repo_alt	2546a72236	Wand aspect list display added	2020-10-01 04:45:20 +03:00
Martin Robertz	ad3f68a2af	Merge pull request #17 from botn365/patch-2 ... fix selecting fluidhandler with transfer fluids	2020-09-29 06:53:58 +02:00
botn365	b59b599c60	fix selecting fluidhandler ... fix if you picked a fluidhandler that is not the first one will still transfer the firsts fluid instead of selected fluid	2020-09-27 08:06:13 +02:00
Martin Robertz	150fbec4ba	Merge pull request #16 from botn365/patch-1 ... alow nbt reading from research station	2020-09-19 16:10:53 +02:00