Commit graph

2058 commits

Author SHA1 Message Date
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
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
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.
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
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 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
yueh
c699ed44aa Fixes api refactoring causing items to be null.
This happens as nothing is registered with minecraft at this point, so it
will always return null for the ItemBlock.
2015-04-02 14:33:39 +02:00
thatsIch
6bd4472229 Merge pull request #1145 from thatsIch/e-number-converter
Using a unified number converter to display short versions of numbers
2015-03-30 21:06:42 +02:00
thatsIch
c9d67e40af Using a unified number converter to display short versions of numbers 2015-03-30 13:06:59 +02:00
thatsIch
9a7329598e Merge pull request #1127 from thatsIch/b-1118-api-crash
Fixes #1118 Does not crash with invalid ItemStacks anymore
2015-03-30 11:54:28 +02:00
thatsIch
278cfc076b Updated to BuildCraft 6.4.5 2015-03-30 11:37:45 +02:00
thatsIch
5c908c7404 Merge pull request #1130 from yueh/fix-1125
Prevent matrix frames from explosions.
2015-03-30 10:38:24 +02:00
thatsIch
65aceeffa8 Merge pull request #1134 from yueh/fix-newapi-nei-facade-handler
Fixes NEI recipe handler
2015-03-29 21:31:11 +02:00
thatsIch
08505e1fa3 Merge pull request #1065 from thatsIch/e-api-access
instance() does not return null anymore, since else it would represent catching a major bug
2015-03-29 21:02:41 +02:00
yueh
b75e8d5824 Fixes NEI recipe handler
.get() is used as it is safe to assert facades are present at this point.
If not there should be an exception being thrown.
2015-03-29 15:51:22 +02:00
yueh
fbda2c571b Prevent matrix frames from explosions.
Fixes #1125
2015-03-29 14:29:54 +02:00
thatsIch
2a89bdf52a Fixes #1118 Does not crash with invalid ItemStacks anymore 2015-03-29 12:46:55 +02:00
thatsIch
67d9a48d75 API jars contain now classes and source files
Updated dependencies also use those
2015-03-29 09:40:27 +02:00
thatsIch
07084939a0 Merge pull request #1117 from thatsIch/b-1115-crash-without-rotarycraft
Fixes #1115 Does not crash anymore without RotaryCraft
2015-03-28 19:15:33 +01:00
thatsIch
a7b0872697 Fixes #1115 Does not crash anymore without RotaryCraft 2015-03-28 19:14:34 +01:00
thatsIch
371588ed79 instance() does not return null anymore, since else it would represent catching a major bug
also does not catch any throwable anymore
2015-03-28 17:11:19 +01:00
thatsIch
92ae39a3ab Merge pull request #1073 from thatsIch/e-api-new-definition
Fixes #675 No disabled feature should log spam or crash anymore.
2015-03-28 17:03:10 +01:00