tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
2558 commits 7 branches 98 tags 24 MiB
Commit graph

2558 commits

This branch
This branch
All branches
Author SHA1 Message Date
Timo Ley
404b4dbab9 Controller now required for infinite channels 2021-03-19 11:08:34 +01:00
Timo Ley
5a2089941d
Merge pull request #1 from xsun2001/rv3-1.7.10 
merge
 2020-08-21 23:53:45 +02:00
xsun2001
a676afbdc9
Fix travis ci 2019-12-08 00:27:34 +08:00
xsun2001
f0170caea3
Fix #28 2019-12-07 23:47:44 +08:00
xsun2001
eeece639b7
ChickenBones' maven repo may be down? 2019-12-07 22:49:25 +08:00
徐晨曦
538eed5a9a
Merge pull request #27 from GTNewHorizons/backport_waila_stuff 
Backport waila stuff
 2019-08-07 16:11:41 +08:00
Jason Mitchell
dca266bc60 Revert "Update gradle.properties" 
This reverts commit 2676c7c09c.
 2019-08-06 20:17:15 -07:00
shartte
52d91ddecb Backport waila features from upstream: 
Show P2P-Tunnel Link Status on WAILA

Implemented QoL improvement for P2P tunnels by showing their link status via WAILA.

Backport - Add P2P frequency to waila & memory card.
 2019-07-17 23:24:57 -07:00
xsun2001
5da42ca598
Fixes #26: Annihilation plane can cause NPE. 2019-06-23 14:21:46 +08:00
Sebastian Hartte
c067f5905d Fixes #24: IndexOutOfBoundsException with FMP parts. 
(cherry picked from commit e67969f52f)
 2019-06-23 14:19:08 +08:00
徐晨曦
a66378a79d
Merge pull request #25 from Sirse/rv3-1.7.10 
Fix duplication glitch
 2019-06-09 12:47:11 +08:00
Sirse
dd14ac0f79 Fix duplication glitch (cherry-pick 8a72ebca8925959bce8809e690f0fb4772ce8c8e) 2019-05-14 22:28:54 +07:00
xsun2001
5d0748aade
fix NPE in getting bounding box. fix #22 . fix #23 . 2019-02-04 16:22:01 +08:00
Sebastian Hartte
6bac87e2c9 Fixes #2536: Mark host for save when placing facades. 
(cherry picked from commit 4f53f5910b)
 2018-06-16 23:53:47 +08:00
xsun2001
761fddaa55 re-add the null check and the permission check 2018-06-16 23:50:50 +08:00
yueh
a2e11b1a3a Fixes #2542: Prevent memory card from opening a GUI 
Some additional cleanup of AEBaseTileBlock#onBlockActivated()

(cherry picked from commit b6d3be41e1)
 2018-06-16 23:44:09 +08:00
Sebastian Hartte
ca2dc468f9 Fixes #2546: When touching an annihilation plane horizontally, use the middle of the entities bounding box on the y-axis to determine whether it is touching the annihilation plane side or not. Otherwise entities did not get picked up when they were *exactly* on the same y-level as the annihilation plane. 
(cherry picked from commit dfe7a29c92)
 2018-06-16 23:38:23 +08:00
Sebastian Hartte
d050451bce Fixes #2547: Crystal growing and forming fluix crystals was not possible on top of an annihilation plane (or any block with a not-quite-full bounding box), because the crystals thought they were not in water. Fixed by using the center of the crystal bounding box to determine water-status, instead of the bottom center. 
(cherry picked from commit 2b02dc19c0)
 2018-06-16 00:00:01 +08:00
Sebastian Hartte
d8bdfeb5dc Fixes #2548: Disable item.csv export on the server side, because we're unable to access creative tab information on the server. 
(cherry picked from commit 071ee83b7a)
 2018-06-15 23:51:58 +08:00
yueh
61fcc75a72 Fixes #2551: Prevent chunk rebuilds when drive is unchanged. 
(cherry picked from commit d7d99c5e7e)
 2018-06-15 23:50:23 +08:00
Sebastian Hartte
c5bf7f6be3 Fixes #2526: Using 5-bit for 0-32 is not sufficient. Rewrote packet for syncing cables to clients to use an easier to deal with format while still saving space in the normal case (2 sides connected to a cable). 
(cherry picked from commit 6b90c70755)
 2018-06-15 23:45:05 +08:00
xsun2001
f7d904c253 port to use java 8 2018-06-15 23:36:08 +08:00
yueh
c4d21c3721 Fixes #2530: Use ItemListIgnoreCrafting to ignore craftable items. 
Wraps the internal inventory into an ItemListIgnoreCrafting to hide
craftable items from it. As the ItemLists will always create a copy of the
actual stack before changing them, it will not affect any itemstack stored
elsewhere.

(cherry picked from commit a9c5019554)
 2018-06-15 23:31:21 +08:00
fscan
768a023897 Fix fluid P2p voiding excess liquids (#3090) 
Backported from 1.12
 2018-06-14 23:55:11 +08:00
fscan
0120df7f8c we dont use scala ... (#3097) 2018-06-14 23:53:59 +08:00
Florian Scandella
83e1e8beed Save changes in AppEngInternalAEInventory too. 2018-06-14 23:52:36 +08:00
Florian Scandella
881cbb63ab always save changes when inventory changes. 
should fix #3059
 2018-06-14 23:52:12 +08:00
xsun2001
e72845ec4a some fix for the cherry-pick 2018-06-14 23:42:23 +08:00
yueh
df57a8f04f Fixes #2724: Use capitalized oredict name for dyes, not uppercase. 
(cherry picked from commit 2ab0528015)
 2018-06-14 23:40:38 +08:00
bartimaeusnek
2676c7c09c
Update gradle.properties 2018-03-05 16:53:34 +01:00
xsun2001
4b0f540c8b new version 2018-03-02 21:59:59 +08:00
xsun2001
3cc48fec60 fix a bug that allows network tool to rotate blocks without the permission. 2018-02-18 20:47:13 +08:00
xsun2001
27fecccec4 fix a bug which can make entropy manipulator still consumes energy when it is prevented from melting a block. 2018-02-18 20:20:36 +08:00
xsun2001
d65c652c7d fix travis ci deploy 2018-02-17 22:32:12 +08:00
xsun2001
d84fce0ffe new version 2018-02-17 22:06:49 +08:00
xsun2001
337d1c8c0e add more permission check 2018-02-16 23:56:03 +08:00
xsun2001
f7102b0126 fix travis ci build config 2018-02-16 18:46:34 +08:00
xsun2001
bc7ff9409b fix #16 2018-02-16 18:39:12 +08:00
徐晨曦
a3de16e222
Merge pull request #17 from bartimaeusnek/rv3-1.7.10 
Fix https://github.com/GTNewHorizons/NewHorizons/issues/2435
 2018-02-16 16:12:59 +08:00
tilera
e2a3e2e4d9 mcmodinfo chenges 2018-02-10 20:33:27 +01:00
tilera
2b42bae8e3 item type config 2018-02-07 21:35:07 +01:00
tilera
b2859863b4
changed item type limit value 2018-02-03 21:52:45 +01:00
tilera
05fa7abdb8 Controller is enabled without channels and item type limit removed 2018-02-03 21:24:01 +01:00
LOKKO12
18cf4c0a30
Fix #2435 
https://github.com/GTNewHorizons/NewHorizons/issues/2435
 2018-01-16 17:16:56 +01:00
xsun2001
df76710f57 new version 2017-12-31 13:55:53 +08:00
xsun2001
bc50afa8df Merge branch 'fix-wrench' into rv3-1.7.10 2017-12-31 13:55:05 +08:00
xsun2001
b8f9d19bb3 add event check to EntropyManipulator 2017-12-31 13:54:30 +08:00
xsun2001
4f7a9f5237 fix the wrench can break ME network using shift + right click. 2017-12-31 13:39:57 +08:00
xsun2001
cf1f039d57 new version 2017-12-31 00:45:43 +08:00
xsun2001
77889845bf fix the bug that allows the NetworkTool to open the chests, which protected by LMC or other plugins, when press shift + right click. 2017-12-29 20:30:01 +08:00