upstream/EnderIO
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/EnderIO.git synced 2026-10-25 20:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,960 Commits 12 Branches 241 Tags
c232ea8534029b6b4262aee1d33e150ff4821008
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Robertz d44c6bb7c7 update deps 2026-09-05 10:11:02 +02:00
Dream Master 070ef99694 update+gradle+deps+bs 2026-08-04 11:41:57 +07:00
Martin Robertz 55928c5234 update deps 2026-07-04 19:29:09 +02:00
Dream Master eb9845d3a0 update+bs+gradle+deps 2026-06-12 16:36:04 +02:00
Martin Robertz 94bd521739 Update Angelica dependency version in dependencies.gradle 2026-02-07 19:10:46 +01:00
Martin Robertz d9df657f35 Update dependencies.gradle (#220) 2026-02-07 19:07:23 +01:00
Martin Robertz 08553f8af2 fix 2026-02-07 19:02:37 +01:00
Martin Robertz 0fe564d007 fix 2026-02-07 18:55:57 +01:00
Martin Robertz 53ba0383fb Merge remote-tracking branch 'origin/master' 2026-02-07 18:46:30 +01:00
Martin Robertz 2c5664ce08 update 2026-02-07 18:46:22 +01:00
Martin Robertz a7acc7e224 update 2025-10-19 20:30:47 +02:00
Martin Robertz a59bb21e59 update 2025-10-12 20:30:55 +02:00
Martin Robertz 6f8b6e2a9c update 2025-10-04 14:26:40 +02:00
Martin Robertz b3def82cde update 2025-09-24 16:49:42 +02:00
Dream Master a233f6ba30 update 2025-07-18 09:47:57 +07:00
Dream Master 313a243bf5 update 2025-07-17 22:29:13 +07:00
Dream Master d5f1008b08 update 2025-07-17 22:28:51 +07:00
Martin Robertz aad9c092b1 update 2025-06-12 23:33:37 +02:00
Martin Robertz e2e22d6103 update 2025-05-26 19:22:34 +02:00
Martin Robertz e829c4168b update 2025-05-23 23:46:07 +02:00
Martin Robertz c10f74486b update 2024-12-31 14:36:18 +01:00
Martin Robertz 948a021f3e update 2024-12-29 18:01:20 +01:00
Martin Robertz 5769ebe3cb update 2024-12-22 01:21:47 +01:00
Martin Robertz e12142890e update 2024-11-16 15:28:59 +01:00
Dream Master 726ce46475 update 2024-11-12 12:15:49 +01:00
Martin Robertz b15d357f1a update 2024-10-21 21:56:28 +02:00
Martin Robertz bf9c2cd2c7 update 2024-10-02 15:16:09 +02:00
Dream Master cf6b678dd9 update 2024-07-15 23:45:30 +07:00
Dream Master 1903589e29 update 2024-07-08 13:26:52 +07:00
Martin Robertz 4ccecf7bc0 update 2024-07-02 23:50:19 +02:00
Martin Robertz 54c6db0afc update 2024-06-05 22:49:08 +02:00
Martin Robertz efb918fc6d update 2024-06-02 23:05:27 +02:00
Martin Robertz fb4c9bde59 update 2024-05-09 10:02:46 +02:00
Martin Robertz 43d74c9a7a update 2024-04-24 21:47:04 +02:00
Martin Robertz ccdef03296 update 2024-04-18 20:42:39 +02:00
Martin Robertz 8ecec5b096 update 2024-02-28 20:07:25 +01:00
Martin Robertz 29554c6a40 update 2024-02-22 13:27:10 +01:00
Martin Robertz 5265340e3c update 2024-02-17 11:13:20 +01:00
Martin Robertz a725ebf120 update bs+deps 2024-01-31 22:47:55 +01:00
Martin Robertz 19f19d348b update bs+deps 2024-01-24 18:19:30 +01:00
Martin Robertz 9e84167012 update bs+deps 2024-01-10 00:42:52 +01:00
Martin Robertz 6a0785e1da exchange existing Item filter from newer Ender io version (#145) 2023-12-30 12:09:44 +01:00
Martin Robertz 6a4d655c71 update deps 2023-12-24 20:21:36 +01:00
Martin Robertz 95daa9b035 update deps 2023-12-20 20:21:36 +01:00
Martin Robertz 23a5484ee8 update deps 2023-12-13 15:38:04 +01:00
Martin Robertz 88725a144d update deps 2023-11-16 13:59:12 +01:00
Martin Robertz 0b0f7a4f1a update deps 2023-11-11 12:13:03 +01:00
Martin Robertz b00c5996f7 update bs+deps 2023-11-11 12:12:45 +01:00
Martin Robertz 2470e81f0e update bs+de+wci 2023-10-15 17:43:47 +02:00
Dream-MasterXXL 4ae9ff2d77 update bs+deps 2023-10-05 00:42:17 +02:00
Martin Robertz 71f79536a7 update deps 2023-09-28 20:54:35 +02:00
Martin Robertz 8e4107d11e update bs+deps 2023-09-22 19:09:29 +02:00
Martin RobertzandRaven Szewczyk 0dd56b62ab update bs+sa+deps (#130) 
* update bs+sa+deps

* Switch immibis microblocks to modrinth maven

* Remove modrinth from repositories as it's now in the buildscript

---------

Co-authored-by: Raven Szewczyk <git@eigenraven.me>
 2023-07-23 11:36:28 +02:00
Martin Robertz 5b46f376eb Update dependencies.gradle 2023-04-23 11:12:50 +02:00
Martin Robertz 5f4a9794b0 update mekanism link 2022-05-17 18:14:44 +02: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
Martin Robertz 6c7c85255d Merge pull request #46 from Kiwi233/master 
Update zh_CN.lang
 2021-12-19 17:03:52 +01:00
Martin Robertz 8190764226 Merge pull request #45 from GTNewHorizons/update_license 
Update License
 2021-12-05 20:48:57 +01: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
Martin Robertz 3bb5e75fac Merge pull request #43 from GTNewHorizons/fix 
Attempt fix of test&run
 2021-12-02 12:58:22 +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
Martin Robertz 62766cf221 Merge pull request #41 from GTNewHorizons/fix-tooltip 
Fix tooltip mB -> L
 2021-11-29 22:50:22 +01:00
Martin Robertz f6e612f01b Merge pull request #40 from GTNewHorizons/fixbuild 
update forge
 2021-11-27 20:14:10 +01:00
Martin Robertz 313b1919a5 Merge pull request #39 from GTNewHorizons/patch-optimize 
Optimize ExistingItemFilter
 2021-11-24 09:52:14 +01: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
Martin Robertz 8a5a84bb20 Merge pull request #35 from Kiwi233/master 
Update zh_CN.lang
 2021-11-01 14:10:06 +01: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
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
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
 2021-10-16 15:21:44 +02:00
Martin Robertz 187ba74826 Merge pull request #30 from GTNewHorizons/fuzzymode-improvements 
Item Filter Improvements
 2021-09-05 18:09:43 +02: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
DreamMasterXXL a2da1c4832 bump version 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
DreamMasterXXL 81ac330ec8 bump version 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
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
Martin Robertz e2b41a49c3 Merge pull request #25 from GTNewHorizons/forestry_compat 
Added forestry sapling support to farm station
 2020-11-08 09:22:35 +01:00
Martin Robertz 76dabdf493 Merge pull request #24 from GTNewHorizons/fix-dupe-mob 
Ignore dead entities when capturing mobs with soul vial
 2020-11-01 10:24:47 +01:00
Martin Robertz 472b3649e1 Merge pull request #22 from Prometheus0000/fused-quartz-nerf 
Change fused quartz blast resistance 2000 -> 20
 2020-10-24 22:34:24 +02:00
Martin Robertz ad1f98b03e Merge pull request #21 from glowredman/master 
Hide tile.blockLightNode.name in NEI
 2020-10-11 12:16:43 +02:00
Martin Robertz 8807be5887 Merge pull request #20 from TataTawa/patch-2 
Update TileConduitBundle.java
 2020-08-31 13:17:05 +02:00
Martin Robertz f492c45f50 Merge pull request #19 from TataTawa/patch-1 
Update TooltipHandlerBurnTime.java
 2020-08-01 16:37:34 +02:00
DreamMasterXXL 2c714d4321 bump version 2020-05-24 16:41:26 +02:00
Martin Robertz 40462a06fd Merge pull request #18 from Kiwi233/master 
Update zh_CN.lang
 2020-05-24 09:03:50 +02:00
Martin Robertz 6ed29e1ae1 Merge pull request #17 from GTNewHorizons/deps 
Fixed Capacitor bug
 2020-05-20 18:39:19 +02:00
DreamMasterXXL f7c2a36e36 removed unused trigger classes from bc 
(cherry picked from commit 08fa2ea69214cb42f635a43e3b8ef2b6f37aa398)
 2020-05-10 14:17:18 +02:00
Martin Robertz 3f57c1ba79 Merge pull request #16 from GTNewHorizons/1.12-stuff 
1.12 stuff
 2020-05-10 13:51:46 +02:00
DreamMasterXXL 1e30b56d65 change version 2020-05-10 13:47:36 +02:00
DreamMasterXXL bace7f93fe update jenkins 2020-05-10 13:42:59 +02:00
DreamMasterXXL dfd194159f Merge remote-tracking branch 'Zoko/release/1.7.10/2.3' into 1.12-stuff 
# Conflicts:
#	.gitignore
#	gradle.properties
#	src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java
 2020-05-10 13:38:46 +02:00
DreamMasterXXL 364f833b55 bump version 2020-04-18 23:40:47 +02:00
DreamMasterXXL 36eaeeb615 Merge remote-tracking branch 'Zoko/master' 2020-04-18 23:40:09 +02:00
DreamMasterXXL 6abe5ea4a9 bump version 2020-04-17 11:25:35 +02:00
Martin Robertz be44112161 Merge pull request #15 from Zoko061602/master 
Fixed basic ItemFilter
 2020-04-17 11:23:56 +02:00