318 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ell	2ab889c467	Merge remote-tracking branch 'origin/master' into master	2020-09-02 22:06:54 +02:00
Ell	b20d15c05a	only save filter data of modified filters ... Closes #26	2020-09-02 22:06:44 +02:00
Ellpeck	f426d307ef	Merge pull request #28 from Quarris/patch-1 ... Expose items field	2020-08-28 17:16:20 +02:00
Quarris	05b4089af1	Expose items field	2020-08-28 16:14:29 +01:00
Ell	f5443becf8	made PipeBlock#getConnectionType not static	2020-08-28 00:33:34 +02:00
Ell	9f049e8b89	made some stuff protected for Quarris	2020-08-28 00:29:44 +02:00
Ellpeck	294559ca61	Create FUNDING.yml	2020-06-15 02:06:06 +02:00
Ellpeck	a0b1fec5f0	update	2020-05-28 14:50:16 +02:00
Ellpeck	8a7388ab57	Fixed pipes being openable with a non-empty hand ... Closes #23	2020-05-28 14:47:25 +02:00
Ellpeck	6de652761a	updeet	2020-05-21 14:28:12 +02:00
Ellpeck	b319df3b09	Merge pull request #22 from Quarris/patch-1 ... Update build.gradle	2020-05-20 00:34:53 +02:00
Quarris	573fb62ded	Update build.gradle	2020-05-19 23:32:45 +01:00
Quarris	0c64e07c3d	Update build.gradle	2020-05-19 23:26:53 +01:00
Ellpeck	2c926aa1c4	Merge pull request #21 from Quarris/patch-1 ... Update build.gradle	2020-05-19 23:44:25 +02:00
Quarris	c5d9681ebb	Update build.gradle	2020-05-19 22:41:07 +01:00
Ellpeck	544e383974	allow modules to be inserted into pipes by right-clicking	2020-05-17 21:05:41 +02:00
Ellpeck	718cef5c4e	only update search text when there are items ... Closes #19	2020-05-17 16:24:24 +02:00
Ellpeck	a026cfc550	made modules be able to send less than their expected amount ... Closes #16	2020-05-17 16:14:27 +02:00
Ellpeck	2a8d43bb30	Change stack limiter module recipe from dispenser to dropper ... Closes #17	2020-05-17 15:30:47 +02:00
Ellpeck	f2ebe8af90	allow modules in pipes connected to terminals	2020-05-17 15:29:10 +02:00
Ellpeck	8046081653	update	2020-05-16 14:30:25 +02:00
Ellpeck	57d2326d06	Merge remote-tracking branch 'origin/master'	2020-05-16 14:28:40 +02:00
Ellpeck	b1d18d751d	Fixed jei recipe transfer not working on servers ... Closes #15	2020-05-16 14:28:25 +02:00
Ellpeck	7f05b862f4	Merge pull request #13 from vanja-san/patch-1 ... Create ru_ru.json	2020-05-13 16:08:58 +02:00
The_BadUser	7946aa57d5	Create ru_ru.json	2020-05-13 15:34:24 +07:00
Ellpeck	2526950023	update	2020-05-12 22:46:27 +02:00
Ellpeck	8d347473af	make "items on the way" only look at items going to the current INVENTORY, not the current pipe	2020-05-10 12:50:24 +02:00
Ellpeck	9fab982e6a	fixed some pipes loading chunks	2020-05-09 21:53:00 +02:00
Ellpeck	9d29ed53c0	fixed single-pipe networks not allowing items through	2020-05-09 21:35:34 +02:00
Ellpeck	def337be85	didn't end up using this	2020-05-09 20:13:16 +02:00
Ellpeck	0af5ccde77	fixed items getting lost with the new system	2020-05-09 20:12:50 +02:00
Ellpeck	ede06585f7	unify item requests into one method	2020-05-09 16:27:49 +02:00
Ellpeck	d33a93e029	update!	2020-05-09 15:45:14 +02:00
Ellpeck	8391f2222a	finished the crafting terminal	2020-05-09 15:42:09 +02:00
Ellpeck	3104062b82	crafting terminal JEI logic!	2020-05-09 14:56:58 +02:00
Ellpeck	f9c5ea86f7	finished the crafting terminal!	2020-05-09 13:40:46 +02:00
Ellpeck	8bd5a0cae3	fixed single-pipe networks crashing ... Closes #10	2020-05-09 13:07:05 +02:00
Ellpeck	172dcc7429	improved network caching	2020-05-09 12:57:25 +02:00
Ellpeck	c21a5ddbb0	fixed network locks not being resolved when a terminal is broken	2020-05-09 12:31:04 +02:00
Ellpeck	88544368eb	Revert "network lock equality, for the future" ... This reverts commit 58558781	2020-05-09 01:21:16 +02:00
Ellpeck	58558781eb	network lock equality, for the future	2020-05-09 01:16:45 +02:00
Ellpeck	ccc981fee3	more crafting terminal work + network locks	2020-05-09 01:00:59 +02:00
Ellpeck	67e7da2b73	crafting terminal base	2020-05-08 22:58:16 +02:00
Ellpeck	0bb8fbaf5c	added jei syncing to the terminal	2020-05-08 21:19:32 +02:00
Ellpeck	5632727d04	made player preferences client-sided	2020-05-08 20:56:27 +02:00
Ellpeck	b65a73c77b	added a search bar to the item terminal	2020-05-08 16:06:17 +02:00
Ellpeck	e1752bb46d	fixed over-sending prevention only working for items of the same type	2020-05-08 15:17:11 +02:00
Ellpeck	320abbe74e	generalize item equality to fix some requesting inconsistencies	2020-05-08 02:51:07 +02:00
Ellpeck	157c6e4d8c	item terminal loot table and also a nice picture for you	2020-05-07 23:28:10 +02:00
Ellpeck	71f884ce2b	update	2020-05-07 23:09:26 +02:00