3682 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Johann Bernhardt	274d43cf82	Migrate to unified build script 2.3.1.21	2021-12-02 11:34:58 +01:00
Johann Bernhardt	63fd5597fe	Move sources and resources. Strip copied dependencies	2021-12-02 11:34:07 +01:00
Martin Robertz	62766cf221	Merge pull request #41 from GTNewHorizons/fix-tooltip ... Fix tooltip mB -> L 2.3.1.20	2021-11-29 22:50:22 +01:00
bombcar	d29f4bdc34	fix outdated obelisk references	2021-11-29 13:48:14 -06:00
bombcar	6867c043a0	correct more lang references	2021-11-29 13:27:10 -06:00
bombcar	749c4e885d	update broken line number	2021-11-29 13:01:50 -06:00
bombcar	511879350b	Fix commenting errors in LANG files - // replaced with #	2021-11-29 13:00:31 -06:00
bombcar	014adcd6c5	Update millibuckets to Liters	2021-11-29 12:51:03 -06:00
Martin Robertz	f6e612f01b	Merge pull request #40 from GTNewHorizons/fixbuild ... update forge	2021-11-27 20:14:10 +01:00
bombcar	787638467c	update forge	2021-11-27 09:42:21 -06:00
Martin Robertz	313b1919a5	Merge pull request #39 from GTNewHorizons/patch-optimize ... Optimize ExistingItemFilter	2021-11-24 09:52:14 +01:00
Glease	0a93c81bb9	Optimize ExistingItemFilter	2021-11-24 16:37:59 +08:00
Martin Robertz	1403f7ba8a	Merge pull request #37 from GTNewHorizons/patch-filter ... Optimize filter code	2021-11-20 11:01:38 +01:00
Martin Robertz	4597d4ebd3	Merge pull request #36 from D-Cysteine/ender-fluid-conduits ... Add more ender fluid conduit types	2021-11-20 09:58:40 +01:00
Martin Robertz	4e5d374d16	Merge branch 'master' into ender-fluid-conduits	2021-11-15 21:08:27 +01:00
Martin Robertz	8021820697	Merge pull request #38 from GTNewHorizons/fill_from_sanity ... Fill from sanity	2021-11-15 19:39:20 +01:00
Jason Mitchell	cdedddca2d	Guard against the same input calling fill multiple times per tick. *cough* GT output hatch *cough*	2021-11-13 15:35:04 -08:00
Glease	e559382474	Optimize filter code	2021-11-14 01:39:13 +08:00
D-Cysteine	af6d093f46	Add more ender fluid conduit types	2021-11-12 23:35:54 -07:00
Martin Robertz	8a5a84bb20	Merge pull request #35 from Kiwi233/master ... Update zh_CN.lang	2021-11-01 14:10:06 +01:00
[Kiwi233]	d384732f4e	Update zh_CN.lang	2021-10-31 11:06:49 +08:00
Martin Robertz	52f3883248	Merge pull request #34 from D-Cysteine/master ... Fix accidentally swapping core and segment textures	2021-10-21 11:53:46 +02:00
D-Cysteine	6c70e43a77	Fix accidentally swapping core and segment textures	2021-10-21 03:45:55 -06:00
Martin Robertz	b100bb2e12	Merge pull request #33 from D-Cysteine/advanced-ender-fluid ... Implement advanced ender fluid conduits	2021-10-17 13:34:22 +02:00
D-CysteineandPrometheus0000	f8605f6642	Implement advanced ender fluid conduits ... Adaptation of code in: * https://github.com/GTNewHorizons/EnderIO/pull/23 Co-Authored-By: Prometheus0000 <8517039+Prometheus0000@users.noreply.github.com>	2021-10-16 19:57:17 -06:00
Martin Robertz	a6c00f117c	Merge pull request #32 from Kiwi233/master ... Update zh_CN.lang	2021-10-16 15:31:32 +02:00
Martin Robertz	a614038a18	Merge pull request #31 from D-Cysteine/master ... Fix capacitor NBT conversion 2.3.1.17	2021-10-16 15:21:44 +02:00
D-Cysteine	cd58ee6866	Remove "_beta" from mod version	2021-10-16 06:06:46 -06:00
[Kiwi233]	a12731398f	Update zh_CN.lang	2021-10-16 16:29:43 +08:00
D-Cysteine	88ac45d6b6	Fix capacitor NBT conversion	2021-10-13 22:53:19 -06:00
Martin Robertz	187ba74826	Merge pull request #30 from GTNewHorizons/fuzzymode-improvements ... Item Filter Improvements	2021-09-05 18:09:43 +02:00
TimeConqueror	10a05d75bc	Collapse logic in #doesItemPassFilter	2021-09-05 00:50:57 +03:00
TimeConqueror	b9d405312d	Item Filters: Changed the logic of fuzzy mode, changed the way empty item list works	2021-08-28 18:50:54 +03:00
DreamMasterXXL	067d602a9d	add(Ender-IO)Changelog	2021-06-27 23:22:33 +02:00
Martin Robertz	9b54770785	Merge pull request #29 from charagarlnad/master ... fix a crash with capacitor banks	2021-03-22 15:50:33 +01:00
charagarlnad	51d553d6a0	fix a crash with capacitor banks	2021-02-28 15:26:50 -06:00
DreamMasterXXL	a2da1c4832	bump version 2.3.1.16_beta	2021-01-29 19:56:32 +01:00
Martin Robertz	a40e48f5d8	Merge pull request #28 from GTNewHorizons/fix_burn_time_tooltip ... Fix Burn Time tooltip	2021-01-24 22:37:43 +01:00
Jason Mitchell	0e7bf1c530	Revert "Update TooltipHandlerBurnTime.java" ... This reverts commit 3093ea6180.	2021-01-24 13:02:17 -08:00
DreamMasterXXL	81ac330ec8	bump version 2.3.1.15_beta	2020-12-15 23:33:49 +01:00
Martin Robertz	c08af8ef02	Merge pull request #26 from dvdmandt/master ... Initial support for channels on EnderFluidConduits	2020-12-13 13:47:37 +01:00
David Lindström	15ed039813	Sync settings layouts for fluid conduits and item conduits	2020-12-13 11:40:59 +01:00
David Lindström	a217fd3699	Make icons explicitly reference the fields from ItemConduit.	2020-12-11 06:16:34 +01:00
David Lindström	246a6d8f0a	Update LiquidSettings.java ... * Fix missing } after merge	2020-12-11 06:09:41 +01:00
David Lindström	b652b79e61	Merge branch 'master' into master	2020-12-11 06:02:45 +01:00
Martin Robertz	27a0a443a2	Merge pull request #27 from GTNewHorizons/feature/ender-conduit-round-robin ... Add round-robin button to ender conduit	2020-12-10 15:19:58 +01:00
Glease	c7a334c913	Add round-robin button to ender conduit ... Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>	2020-12-10 19:32:40 +08:00
David Lindström	f512b210a5	Initial support for channels on EnderFluidConduits ... This is pretty basic support for channels. There's plenty of room for optimizations in the network logic.	2020-12-08 00:21:44 +01:00
Martin Robertz	e2b41a49c3	Merge pull request #25 from GTNewHorizons/forestry_compat ... Added forestry sapling support to farm station 2.3.1.14_beta	2020-11-08 09:22:35 +01:00
bdew	7f89eba8b5	Added forestry sapling support to farm station ... Cherry picked & backported from 1b242dc2d786b8c1fb545845768faa1f6c15818a	2020-11-07 12:50:04 -08:00