fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,074 Commits 45 Branches 194 Tags
c2cd395ca1f0abdf7b021be94f58b4bde63658dc
Commit Graph

2074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yueh c2cd395ca1 Fixed interface dropping items into itself 
Fixes #456
 2015-04-23 15:57:12 +02:00
thatsIch 36c72d641f Merge pull request #1282 from theelixzammuto/rv2 
Update it_IT.lang
 2015-04-14 18:38:06 +02:00
theelixzammuto f878a7598d Update it_IT.lang 2015-04-14 18:07:07 +02:00
thatsIch 817163dbf6 Merge pull request #1240 from bakaxyf/rv2 
Update zh_CN.lang
rv2.beta.28 		2015-04-08 21:03:31 +02:00
thatsIch d164e279ef Merge pull request #1238 from thatsIch/b-1202-item-count 
Fixes #1202: Now 10000x is the limit before being converted to next bigger unit
 2015-04-08 15:35:07 +02:00
bakaxyf 4f9b8db6fc Update zh_CN.lang 2015-04-08 12:16:13 +08:00
thatsIch b58c92ebb6 Fixes #1202: Now 10000x items is the limit before being converted to next bigger unit 
Added a new method to display a number in a long fashion.
Added respective unit tests for them
 2015-04-07 23:46:52 +02:00
yueh 2667b8eac6 Merge pull request #1233 from yueh/fix-1230 
Changed to LinkedHashSet to maintain insertion order
rv2.beta.27 		2015-04-07 12:50:27 +02:00
yueh 235fad439d Merge pull request #1228 from yueh/fix-1222 
Changed the order as WATs are special and needing a position
 2015-04-07 12:50:21 +02:00
yueh fcea444041 Changed to LinkedHashSet to maintain insertion order 
Fixes #1230
 2015-04-07 12:28:45 +02:00
yueh 80f56d4359 Changed the order as WATs are special and needing a position 
Fixes #1222
 2015-04-07 00:17:55 +02:00
thatsIch f14bfa7d53 Merge pull request #1227 from bakaxyf/rv2 
Update zh_CN.lang
 2015-04-06 22:42:57 +02:00
bakaxyf a7d55ee520 Update zh_CN.lang 2015-04-07 04:39:19 +08:00
thatsIch 7382897e8e Merge pull request #1225 from thatsIch/b-dev-jar-duplicates 
Deobfuscated version for Developers contains no dupes anymore
 2015-04-06 20:31:48 +02:00
thatsIch aac2b598ea Merge pull request #1221 from Adaptivity/rv2 
Update ru_RU.lang
 2015-04-06 20:30:44 +02:00
thatsIch 0f31cd43d2 Deobfuscated version for Developers contains no dupes anymore 2015-04-06 19:42:20 +02:00
yueh 788de6d432 Merge pull request #964 from yueh/fix-889 
Fixes #889 possible dupe bug
rv2.beta.26 		2015-04-06 15:54:23 +02:00
thatsIch 04a6a683bc Merge pull request #1220 from thatsIch/e-1219-hardcoded-localizations 
Fixes #1219: Improved localization options
 2015-04-06 15:44:36 +02:00
thatsIch 25e433f7bd Merge pull request #1215 from thatsIch/e-1054-inscriber-api 
Closes #1054: Adds an Inscriber API for Developers
 2015-04-06 15:44:27 +02:00
Anton fbc44f47c8 Update ru_RU.lang 2015-04-06 16:32:05 +03:00
thatsIch 06bca227d0 Closes #1054: Adds an Inscriber API for Developers 2015-04-06 13:45:27 +02:00
thatsIch 8321a5fe1c Fixes #1219: Improved localization options 2015-04-06 13:37:40 +02:00
yueh 1bb8de3570 Merge pull request #1216 from yueh/cleanup-modifier-order 
Modifier are now using a consistent order based on the java conventions
 2015-04-06 13:31:21 +02:00
thatsIch 8666937117 Merge pull request #1210 from thatsIch/e-1207-channels 
Fixes #1207 → Enables resource packs more fine tuned information in WAILA channel display
 2015-04-06 13:09:54 +02:00
yueh eaf57bedf6 Modifier are now using a consistent order based on the java conventions 2015-04-06 00:35:42 +02:00
thatsIch a30ef4679c Fixes #1207 → Enables resource packs more fine tuned information in WAILA channel display 2015-04-05 23:06:31 +02:00
yueh 0ee2ca72ac Merge pull request #1206 from yueh/fix-1068 
Stops AEBaseItemBlock from modifying the metadata before placing.
rv2.beta.25 		2015-04-05 20:47:31 +02:00
thatsIch 881bb919da Merge pull request #1205 from thatsIch/b-npe-on-random-smashing-button 
Fixes NPE on random button smashing
 2015-04-05 20:18:10 +02:00
thatsIch 5ecd68d5b6 Merge pull request #1209 from thatsIch/b-integration-with-gradle 
Fixes integration bug for Resources between Gradle and IntelliJ, does not affect Eclipse
 2015-04-05 20:18:03 +02:00
thatsIch e2d0e5d424 Dont use instance reference for static references 2015-04-05 15:59:23 +02:00
thatsIch e3bf7d63c0 Split one liner declarations 2015-04-05 15:57:37 +02:00
thatsIch 3fedcf273b Remove random semicolons 2015-04-05 15:56:10 +02:00
thatsIch 8042dbb3db Fixes integration bug for Resources between Gradle and IntelliJ, does not affect Eclipse 2015-04-05 15:25:26 +02:00
yueh e7e397c412 Stops AEBaseItemBlock from modifying the metadata before placing. 2015-04-05 14:01:42 +02:00
thatsIch ecc472a692 Fixes NPE on random button smashing 2015-04-05 13:07:19 +02:00
thatsIch 9790d9fd93 Merge pull request #1187 from thatsIch/b-1059-fmp-disables-interfaces 
Fixes #1059 FMP like TileEntities are not valid Interface targets anymore
rv2.beta.24 		2015-04-04 14:55:21 +02:00
yueh f3f89344b4 Merge pull request #1192 from yueh/fix-1191 
Moved AEBaseBlock.setFeature() to the end of any constructor.
 2015-04-04 14:40:35 +02:00
thatsIch bac94b67b8 Merge pull request #1199 from thatsIch/b-skychest-invtweaks-interaction 
Fixes interaction bug between Sky Stone Chest and Inventory Tweaks
 2015-04-04 14:33:06 +02:00
thatsIch ba1afcca38 Merge pull request #1198 from thatsIch/e-1197-ae-vibration 
Fixes #1197 Vibration Chamber does produce AE, not ae
 2015-04-04 14:32:54 +02:00
thatsIch bb1c341c95 Fixes #1059 FMP Blocks don't disturb the ME Interface identifier 2015-04-04 14:32:17 +02:00
thatsIch 2ef04f1303 Fixes interaction bug between Sky Stone Chest and Inventory Tweaks upon sort via space + click 2015-04-04 12:56:42 +02:00
thatsIch 632d048ee2 Fixes #1197 Vibration Chamber does produce AE, not ae 2015-04-04 12:26:15 +02:00
yueh adea6b3dec Moved AEBaseBlock.setFeature() to the end of any constructor. 
Otherwise it can cause a registration of incomplete blocks, like missing
subtypes.
 2015-04-04 01:31:51 +02:00
yueh 5416ea2365 Fixes 889 possible dupe bug 
Adds a hotfix to prevent duping with portable cells.
Should possibly fix the NPE crash with switching slots on laggy servers.
 2015-04-03 17:23:17 +02:00
thatsIch a081a4f066 Updating to BC 6.4.6 rv2.beta.23 2015-04-03 15:28:33 +02:00
thatsIch b54676793e Merge pull request #1181 from thatsIch/e-basic-reformat 
Basic reformat, hit once, hope never again
 2015-04-03 15:15:42 +02:00
thatsIch d34c988c88 Basic reformat, hit once, hope never again 2015-04-03 15:07:13 +02:00
yueh 4ff1631f89 Merge pull request #1175 from yueh/fix-1143 
Fixes api refactoring causing items to be null.
 2015-04-03 11:40:23 +02:00
yueh dc6a325392 Merge pull request #1176 from yueh/fix-1174 
Added missing Block.damageDropped() to OreQuartzCharged
 2015-04-03 11:40:17 +02:00
yueh 4f364a46df Added missing Block.damageDropped() to OreQuartzCharged 
This was previously handled by a template method, but it was removed with
the api refactoring.

Fixes #1174
 2015-04-02 15:57:43 +02:00