upstream/EnderIO
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/EnderIO.git synced 2026-10-26 14:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,698 Commits 12 Branches 241 Tags
2.3.1.26
Commit Graph
3698 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eldrinn-Elantey 016f14f4f4 Update en_US.lang, Update en_US.lang (#50) 
* Update en_US.lang

* Update ru_RU.lang
2.3.1.26 		2022-01-16 12:12:44 +01:00
Zereff06 7bfbc17d2d Update ru_RU.lang (#49) 
* Update ru_RU.lang

* Update ru_RU.lang

* Update ru_RU.lang
2.3.1.25 		2022-01-10 21:06:56 +01:00
Zereff06 8c442521a6 Update ru_RU.lang (#48) 
* Update ru_RU.lang

* Update ru_RU.lang
 2022-01-10 12:46:00 +01:00
Martin Robertz 21545ccf49 Merge pull request #47 from D-Cysteine/master 
Fix error migrating advanced ender fluid conduits
 2021-12-23 12:52:31 +01:00
D-Cysteine fd8cf1f516 Fix error migrating advanced ender fluid conduits 2021-12-23 03:31:48 -07:00
Martin Robertz 6c7c85255d Merge pull request #46 from Kiwi233/master 
Update zh_CN.lang
2.3.1.24 		2021-12-19 17:03:52 +01:00
[Kiwi233] 169cc58bb1 Update zh_CN.lang 2021-12-19 22:39:39 +08:00
Martin Robertz 8190764226 Merge pull request #45 from GTNewHorizons/update_license 
Update License
2.3.1.23 		2021-12-05 20:48:57 +01:00
Jason Mitchell d92ca1f4a3 Update License 2021-12-05 11:40:15 -08:00
Glease 0f7ded0810 update cglib to make shading work. load after chisel to not screw up classloading 2.3.1.22 2021-12-04 02:31:24 +08:00
Martin Robertz ba95064895 ignore bat files 2021-12-03 11:01:53 +01:00
Martin Robertz 0e01fafcca Merge pull request #44 from GTNewHorizons/fix 
Fix EnderIO API artifact
 2021-12-02 19:28:59 +01:00
Johann Bernhardt 0f50440af6 Fix EnderIO API artifact 2021-12-02 19:26:30 +01:00
Martin Robertz 3bb5e75fac Merge pull request #43 from GTNewHorizons/fix 
Attempt fix of test&run
 2021-12-02 12:58:22 +01:00
Johann Bernhardt 86c2790a78 Attempt fix of test&run 2021-12-02 12:50:08 +01:00
Martin Robertz d2c31e08a9 Merge pull request #42 from GTNewHorizons/update-build-script 
Update build script
 2021-12-02 12:01:31 +01:00
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