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

2506 commits

This branch
This branch
All branches
Author SHA1 Message Date
yueh
a62e157e7c Merge pull request #2091 from Adaptivity/master 
Ore Dictionary support for recipes
 2016-01-08 21:00:34 +01:00
yueh
106b823827 Merge pull request #2088 from fnuecke/master 
Reworked computer P2P tunnel for #2087
 2016-01-08 20:48:27 +01:00
yueh
8406c00e22 Merge pull request #2092 from GWYOG/master_patch_1 
Update zh_CN.lang, fix #2090
 2016-01-08 20:36:29 +01:00
JJN
22f05428be fixed #2090 
fixed #2090
 2016-01-07 09:29:49 +08:00
Adaptivity
bd0bf26f30 Ore Dictionary support for recipes 
Added missing changes to oredict.recipe
 2016-01-06 20:29:33 +03:00
Florian Nücke
2ea05bce5f Reworked computer P2P tunnel to use events, and cleaned up reconnection, fixes #2087. 
Just `onTunnelNetworkChange` with tickable is apparently less exhaustive, and less stable. This now avoids issues with network splits and reconnects not being handled in some cases. Also simplified reconnection; there was some duplicate logic in there, with a missing validity check which potentially led to invalid connections.
 2016-01-05 19:05:25 +01:00
yueh
f47fd1957a Merge pull request #2075 from yueh/fix-2043 
Fixes #2043: Storage buses updates should happen in the correct order.
 2016-01-05 13:53:01 +01:00
yueh
a890e57e44 Merge pull request #2085 from yueh/fix-wrong-api-version 
Changed outdated API version to rv3
 2016-01-04 08:09:58 +01:00
thatsIch
6e61627d7c Merge pull request #2006 from Mazdallier/patch-1 
Update fr_FR.lang
 2016-01-03 14:42:59 +01:00
thatsIch
580a17987b Merge pull request #2079 from Honon/patch-1 
Japanese translation files
 2016-01-03 14:42:07 +01:00
yueh
bfe2e6ecb3 API version will be replaced during build with the correct rv. 2016-01-03 14:28:37 +01:00
yueh
38e7e579fa Fixes #2043: Storage buses updates should happen in the correct order. 
This is loosely based on #2032 and should prevent any duplicated event,
but still does a refresh the whole cache due to potentially issues with
some inventories.

It also ensures that storage buses will not announce a CellArrayUpdate
before they are fully initialized, thus no longer causing them to return
null during an update.

Fixes #2403
 2016-01-03 13:23:51 +01:00
Tier
6aa91c3f65 Japanese translation files 
Hello!!
As we have created a Japanese translation files , and you sure you want to got to add when it is good?
 2015-12-29 17:46:20 +09:00
yueh
17bdd085b1 Merge pull request #2010 from yueh/feature-logger-refactoring 
Refactored the logging
 2015-12-27 12:53:01 +01:00
yueh
684cda58c2 Merge pull request #2074 from yueh/backport-1.8-cleanup 
Backport some 1.8 cleanups
 2015-12-27 12:50:11 +01:00
yueh
740324913e Merge pull request #2073 from yueh/fix-1905-followup 
Interfaces now slow down with failed crafting attempts.
 2015-12-27 12:50:01 +01:00
yueh
dae5e888e9 Merge pull request #2059 from wlhlm/update-german-translation 
Update and extend German translation
 2015-12-27 12:49:49 +01:00
yueh
a3abc7a1f0 Backport some 1.8 cleanups 2015-12-27 12:33:50 +01:00
yueh
dd1ae4a9b5 Interfaces now slow down with failed crafting attempts. 
Cleanup of unneeded tracking of failed attempts of MultiCraftingTracker.
Followup of #1905
 2015-12-27 00:00:12 +01:00
yueh
c9ef1beea1 Refactored the logging 
Using LogManager instead of FMLRelaunchLog to access the logger instance.
Added logging of the name of failed exports instead of exception.
Improved crafting log to include issuer including their location and the
requested item.
Removed superfluous FMLRelaunchLog instance.
Removed superfluous parameters for PlayerData constructor.

Closes #2009
Refs #2069
 2015-12-26 23:14:29 +01:00
Wilhelm Schuster
276480519e Update and extend German translation 
Add translated achievements.
 2015-12-20 14:23:42 +01:00
yueh
04b1ca3485 Merge pull request #2050 from XFRGod/patch-7 
Update hu_HU.lang
 2015-12-11 22:39:14 +01:00
yueh
c14f688100 Merge pull request #1997 from thatsIch/b-1995-versionchecker-config 
Fixes #1995: Allows creation of version checker config file after start up
 2015-12-11 22:38:54 +01:00
yueh
8bf98919e2 Merge pull request #2053 from AppliedEnergistics/revert-2032-feature-cached-networkmonitor 
Revert "Changed NetworkMonitor to update its cache."
 2015-12-11 22:31:46 +01:00
yueh
1862ab3562 Revert "Changed NetworkMonitor to update its cache." 2015-12-11 22:26:21 +01:00
XFRGod
df6070ecbd Update hu_HU.lang 
This is a language "correction"(?) and typo fixing update for the lang file and now it's 110% localized:D
 2015-12-11 16:04:16 +01:00
yueh
12cf76a62f Merge pull request #1880 from yueh/feature-rendering-cleanup 
Rendering cleanup
 2015-12-10 16:36:01 +01:00
yueh
919faefb15 Merge pull request #2032 from yueh/feature-cached-networkmonitor 
Changed NetworkMonitor to update its cache.
 2015-12-10 16:34:24 +01:00
yueh
71a9687b01 Merge pull request #2045 from yueh/fix-2044 
Fixes #2044: No longer uses internal exceptions
 2015-12-10 16:33:25 +01:00
yueh
e877eac7bb Fixes #2044: No longer uses internal exceptions 
Added 3 new exception as subclass to FailedConnection to allow a more
precise handling and/or logging.
 2015-12-10 16:24:40 +01:00
yueh
0696662254 Changed NetworkMonitor to update its cache. 
No longer invalidates and refresh it with every single change.
This should now also ensure that updates are send exactly once per network
instead of multiple times scaling up with the amount of chained networks.
 2015-12-10 16:11:30 +01:00
yueh
1aa84945eb Merge pull request #2037 from XFRGod/patch-5 
Update hu_HU.lang
 2015-12-07 20:40:53 +01:00
XFRGod
88f9c8ba40 Update hu_HU.lang 
Okay now it's absolutely 100% done and I'm officially dead.
Onto EnderIO and Botania then!
 2015-12-06 21:36:53 +01:00
yueh
0ed1054aad Merge pull request #2035 from XFRGod/patch-3 
Update hu_HU.lang
 2015-12-06 16:55:53 +01:00
XFRGod
11f92f6888 Update hu_HU.lang 2015-12-06 16:49:45 +01:00
yueh
b0d3a6c743 Merge pull request #2022 from yueh/feature-revert-itemlist-changes 
Reverts some of the changes to ItemList.
 2015-12-06 14:36:45 +01:00
yueh
b252d1f269 Merge pull request #2028 from yueh/fix-2027 
Fixes 2027: TinyTNT not triggered by flint&steel.
 2015-12-06 14:36:09 +01:00
yueh
d4692128a5 Merge pull request #2031 from yueh/e-gridconnection-better-logging 
Exception during GridConnection now reports the machine and side.
 2015-12-06 14:35:54 +01:00
yueh
599e6f3e64 Exception during GridConnection now reports the machine and side. 2015-11-30 12:55:47 +01:00
yueh
478d400627 Fixes 2027: TinyTNT not triggered by flint&steel. 2015-11-29 18:21:05 +01:00
yueh
fbfd13d163 Reverts some of the changes to ItemList. 
Removes the split collection as in some rare corner cases the insertion
order is important to maintain the correct data in terms of self cleaning.

Keeps the general cleanups and split of Fluid/ItemList.

Fixes #1964
 2015-11-28 11:12:31 +01:00
Mazdallier
5bb0ac7833 Update fr_FR.lang 
thanks Pyeroh
 2015-11-17 10:27:12 +01:00
yueh
8b4a39085e Fixes #1998: Using the correct culling mode and rotation 
Blocks are now rendered with the correct culling mode and rotated similar
to the icon itself, but slightly shifted to the left that the front
texture appears larger (This applies to items following the normal
minecraft rotation like furnaces)

Items are also now rotated a bit differently and more in line with their
item rendering as well as longer being mirror inverted.
 2015-11-16 11:31:02 +01:00
yueh
d5dfc31210 Rendering cleanup 
Replaces the reflexive instantiation of the Renderes with a factory
method.

Some optimizations to the renderers to no longer push the whole OpenGL state to the stack.

General cleanup of duplicate code, etc
 2015-11-16 10:52:20 +01:00
yueh
824ec1eccb Merge pull request #1986 from yueh/fix-1983 
Fixes #1983: WorldData cleared too early when still needed.
 2015-11-16 10:51:05 +01:00
yueh
87eb5498f9 Merge pull request #1996 from thatsIch/b-1970-inscriber-lighting 
Fixes #1970: Lighting was not re-enabled when looking at an inscriber
 2015-11-16 10:50:56 +01:00
Mazdallier
55c0e6aa56 Update fr_FR.lang 2015-11-16 09:47:36 +01:00
thatsIch
8c62e1e7a6 Fixes #1995: Allows creation of version checker config file after start up 2015-11-11 21:39:29 +01:00
thatsIch
97c099c2ae Fixes #1970: Lighting was not re-enabled when looking at an inscriber 2015-11-11 21:36:53 +01:00
yueh
3c19350b9b Fixes #1983: WorldData cleared too early when still needed. 2015-11-02 12:13:09 +01:00