148 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Ellpeck	5541d5d1a4	finished the item terminal, yay	2020-05-07 23:06:35 +02:00
Ellpeck	01dda04701	added scrolling to the terminal ui	2020-05-07 21:50:50 +02:00
Ellpeck	c357550956	fixed terminals not updating when sending items	2020-05-07 21:25:46 +02:00
Ellpeck	fe3d4380f3	IT'S DONE	2020-05-07 21:10:29 +02:00
Ellpeck	ae74359ed5	item terminal, part 1	2020-05-07 18:30:40 +02:00
Ellpeck	d4031c19e1	move containers package to the right place	2020-05-07 15:48:46 +02:00
Ellpeck	f9bbc16b7b	Revert "added pipe network energy storages" ... This reverts commit 9a934431	2020-05-07 15:46:49 +02:00
Ellpeck	9a93443152	added pipe network energy storages	2020-05-07 14:39:26 +02:00
Ellpeck	539fdc2be4	publish this	2020-05-07 12:39:27 +02:00
Ellpeck	16c7a67a13	added the redstone module	2020-05-03 15:51:16 +02:00
Ellpeck	d8255ca07b	added comparator output to pipes	2020-05-03 15:33:56 +02:00
Ellpeck	5306595e24	update	2020-05-02 19:45:20 +02:00
Ellpeck	c0c69807c0	fixed pipe tabs not updating occasionally	2020-05-02 19:37:11 +02:00
Ellpeck	d46858507f	added filter modules	2020-05-02 18:56:54 +02:00
Ellpeck	2b882649fb	fixed filters being too picky	2020-04-30 17:14:15 +02:00
Ellpeck	db3b2f0551	forgot to commit this update, bleh	2020-04-30 17:09:18 +02:00
Ellpeck	ccc1547292	fixed some stuff unnecessarily happening on the client ... Closes #2	2020-04-29 14:06:19 +02:00
Ellpeck	ac0c456196	also fix the toml here	2020-04-28 21:22:04 +02:00
Ellpeck	0493df938f	fixed pipe frames picking the wrong item in creative	2020-04-20 19:22:30 +02:00
Ellpeck	d6a261f950	updaet	2020-04-20 16:49:31 +02:00