FireBall1725
7099678dc8
Merge pull request #213 from thatsIch/inverted
...
Fixed #209 - Inverted damage bar
2014-10-01 08:14:08 -04:00
FireBall1725
51fe1e14b6
Merge pull request #214 from thatsIch/imports
...
Remove not needed imports
2014-10-01 08:12:53 -04:00
thatsIch
ddd998fe31
Throw the throwables
2014-10-01 11:41:52 +02:00
thatsIch
c5d67997d8
Replace deprecated method calls to FMP
2014-10-01 11:39:58 +02:00
thatsIch
cd064ec05c
Remove redundant local variables
2014-10-01 11:34:27 +02:00
thatsIch
cc9d89dc73
Remove only redirections to super call
2014-10-01 11:18:35 +02:00
thatsIch
d6917fdc5b
Use StringBuilder to its fullest
...
Linearized append logic
2014-10-01 11:07:13 +02:00
thatsIch
4782877e8c
Added missing javadoc
2014-10-01 10:54:50 +02:00
thatsIch
dedefee30b
Remove not needed imports
2014-10-01 10:43:26 +02:00
thatsIch
ea33c116ab
Fixed #209 - Inverted damage bar
2014-10-01 10:03:52 +02:00
Chris
e1627734b1
Merge pull request #207 from yueh/performance-optimizations
...
Some performance or memory optimizations
2014-09-30 15:07:13 -07:00
yueh
7fa7e43c29
Some performance or memory optimizations
...
Replaced String concat in loops with StringBuilder (performance)
Replaced for with keySet + Map.get() through for with entrySet (perf)
Changed inner classes to static classes, mostly struct like (memory)
2014-09-30 23:20:02 +02:00
yueh
79837cf35f
Adds filter by pattern to the interface terminals
...
Some code cleanup
2014-09-30 23:04:14 +02:00
yueh
185500c017
Adds filter by machine name to interface terminals
2014-09-30 23:03:45 +02:00
Chris
d8da97d2af
Merge pull request #199 from thatsIch/displaydamage
...
Replace getDisplayDamage with getDurabilityForDisplay
2014-09-30 13:48:12 -07:00
Chris
0fe360b690
Merge pull request #201 from thatsIch/asm
...
Replaced MethodIsnNode of ASM with newer constructor to resolve deprecation
2014-09-30 13:47:57 -07:00
Chris
b68e94cb0c
Merge pull request #198 from thatsIch/containeritem
...
Replaced all instances of hasContainerItem with its ItemStack version when it had @Override
2014-09-30 13:44:03 -07:00
Chris
dcef01a4f1
Merge pull request #197 from thatsIch/wrench
...
Added harvest level of wrenches and network tools to 'wrench'
2014-09-30 13:43:05 -07:00
Chris
8147b04dbe
Merge pull request #187 from thatsIch/FinalFields
...
Make fields final if possible to ensure immutability
2014-09-30 13:42:25 -07:00
thatsIch
7c2d3c3711
Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2
2014-09-30 17:28:55 +02:00
thatsIch
94199154a6
Update Localization
2014-09-30 17:28:08 +02:00
thatsIch
7607e6be9b
Replaced MethodIsnNode of ASM with newer constructor to resolve deprecation
2014-09-30 15:53:45 +02:00
thatsIch
66a09ecbca
Replace getDisplayDamage with getDurabilityForDisplay
2014-09-30 15:33:07 +02:00
thatsIch
b9687d01a0
Replaced all instances of hasContainerItem with its ItemStack version when it had @Override
2014-09-30 15:22:31 +02:00
thatsIch
93c724443a
Added harvest level of wrenches and network tools to 'wrench'
2014-09-30 15:16:33 +02:00
thatsIch
807f9ed12d
Fixed wrong generic
2014-09-30 09:55:17 +02:00
thatsIch
474596f095
Make fields final if possible to ensure immutability
2014-09-30 09:52:57 +02:00
Chris
35f6c84d9f
Merge pull request #194 from FireBall1725/rv2
...
Downgraded forge to 1208 to fix compatiblity with forge multiparts
2014-09-29 19:11:07 -07:00
FireBall1725
e2e8ecb213
fixed errors, will need to be updated for newer forge versions
2014-09-29 21:18:59 -04:00
Chris
253085185f
Merge pull request #186 from thatsIch/Return
...
Removes unnecessary returns
2014-09-29 17:58:58 -07:00
thatsIch
abfec0946c
Resolved conflicts
2014-09-29 23:51:00 +02:00
thatsIch
9c16e87789
Replaced normal for loops with foreach loops which is less error prone when just iterating over collection/array
2014-09-29 23:48:56 +02:00
thatsIch
3db2d4960b
Replaced normal for loops with foreach loops which is less error prone when just iterating over collection/array
2014-09-29 23:48:25 +02:00
thatsIch
39b464fb2f
Resolved conflict
2014-09-29 23:36:53 +02:00
thatsIch
a21268a7b5
Replaced normal for loops with foreach loops which is less error prone when just iterating over collection/array
2014-09-29 23:35:17 +02:00
thatsIch
aba0c44916
Removes unnecessary returns
2014-09-29 23:27:25 +02:00
Chris
87126e1f11
Merge pull request #185 from thatsIch/Cast
...
Removes not needed casts
2014-09-29 14:14:25 -07:00
Chris
3d41dedc7c
Merge pull request #184 from thatsIch/Final
...
Removes redundant final modifiers of private methods
2014-09-29 14:11:35 -07:00
Chris
1404a2fe97
Merge pull request #183 from thatsIch/Equals
...
Replaces String == comparison with .equals()
2014-09-29 14:10:39 -07:00
Chris
7b3bde7906
Merge pull request #182 from thatsIch/While
...
Replaces while iterators with foreach call
2014-09-29 14:10:03 -07:00
Chris
d163b2f6dd
Merge pull request #179 from thatsIch/Self
...
Self assignment
2014-09-29 14:06:43 -07:00
Chris
b48d35bf78
Merge pull request #178 from thatsIch/Redundant
...
Removed redundant array creations just to match varargs operations
2014-09-29 14:06:27 -07:00
thatsIch
2688548479
Merge pull request #190 from yueh/feature-progress-provider
...
Moving the handling of progress to GuiProgressBar
2014-09-29 21:57:20 +02:00
thatsIch
9e97c51746
Merge pull request #180 from thatsIch/Boxing
...
Removes not needed Boxing
2014-09-29 21:55:28 +02:00
yueh
21a7d815ae
Moving the handling of progress to GuiProgressBar
...
Adds an interface providing data for GuiProgressBar
Changed all containers simulating progress to implement the interface
2014-09-29 20:00:18 +02:00
yueh
a3705c54cd
Removed unused and likely buggy class SortedList
2014-09-29 17:19:51 +02:00
thatsIch
35c00873c1
Merge pull request #188 from yueh/cleanup-code
...
Added checks for null and equal class to .equals()
2014-09-29 15:41:42 +02:00
yueh
7ff54c6831
Fixed typo in SyncData
2014-09-29 15:25:48 +02:00
yueh
fd7c1ff5f8
Added checks for null and equal class to .equals()
...
Also switched a check for null in OreHelper#sameOre to prevent null ==
null => true
2014-09-29 12:39:40 +02:00
thatsIch
3ce47a167f
Removes not needed casts
2014-09-29 09:42:50 +02:00
thatsIch
3ae892137d
Removes redundant final modifiers of private methods
2014-09-29 09:31:45 +02:00
Andrew
d08ce4a2b4
Deleted some parens and fixed indentation
2014-09-29 00:29:55 -07:00
thatsIch
1d1ea7a03e
Replaces String == comparison with .equals()
2014-09-29 09:28:58 +02:00
thatsIch
b6ec21c70a
Replaces while iterators with foreach call
2014-09-29 09:26:35 +02:00
Andrew
5c5aaa21ee
Merge remote-tracking branch 'upstream/rv2' into rv2
...
Conflicts:
src/main/java/appeng/items/tools/powered/ToolMassCannon.java
2014-09-29 00:26:15 -07:00
thatsIch
caffaef835
Replaced normal for loops with foreach loops which is less error prone when just iterating over collection/array
2014-09-29 09:23:02 +02:00
thatsIch
f95d221859
Removes not needed Boxing
2014-09-29 09:17:33 +02:00
thatsIch
7f52394511
Self assignment
2014-09-29 09:14:58 +02:00
thatsIch
f49407de2c
Removed redundant array creations just to match varargs operations
2014-09-29 09:12:06 +02:00
Chris
62fcf26fcc
Merge pull request #175 from thatsIch/TypeSafety
...
Type safety
2014-09-28 19:51:31 -07:00
Andrew
fd18393a8b
Merge remote-tracking branch 'upstream/rv2' into rv2
2014-09-28 14:33:43 -07:00
thatsIch
56757bd828
Fixed crafting watchers not having the right type
2014-09-28 22:45:57 +02:00
thatsIch
f1ffbf08a2
Resolved some unchecked Types
2014-09-28 22:20:14 +02:00
thatsIch
f63aa6d17e
Merge pull request #172 from yueh/cleanup-forwarding-super
...
Removed methods with only call to super
2014-09-28 21:38:55 +02:00
yueh
0f6d49fbef
Removed missed ones
2014-09-28 21:19:29 +02:00
Andrew
da63aca95c
Deleted unnecessary casts with Eclipse
2014-09-28 11:56:16 -07:00
Andrew
94d5319038
Fixed some warnings about unnecessary code
2014-09-28 11:55:09 -07:00
Andrew
d75a60cbaa
Deleted unused imports
2014-09-28 11:36:14 -07:00
Andrew
8514e32f5f
Added missing @Override annotations with Eclipse
2014-09-28 11:34:00 -07:00
thatsIch
b6273d9c0c
Merge pull request #167 from yueh/cleanup-forwarding-super
...
Removed methods only forwarding their call to the corresponding super class
2014-09-28 20:20:32 +02:00
yueh
53694bdd3a
Removed methods only forwarding their call to the corresponding super class
2014-09-28 20:15:26 +02:00
thatsIch
a745e00115
Fixed typos in MatterCannon
2014-09-28 19:46:10 +02:00
Andrew
0042176f29
Deleted redundant null checks
2014-09-28 10:41:51 -07:00
Chris
f9b9729fb5
Merge pull request #157 from thatsIch/Spelling
...
Spelling
2014-09-28 10:09:39 -07:00
Chris
fd0ea8b903
Merge pull request #156 from thatsIch/Semicolon
...
Semicolon
2014-09-28 10:09:21 -07:00
The Paper Pilot
1cf54c515e
Removed duplicate code
...
This also prevents the storage bus from sending 2 packets instead of 1 when the fuzzy button is pressed
2014-09-28 11:58:21 -05:00
thatsIch
29a7ed4a62
Merge pull request #4 from Kolatra/master
...
Fixed #1138 replaces itemWheat with cropWheat, the oredictionaried name of MinecraftForge
2014-09-28 14:43:08 +02:00
thatsIch
76a515db4e
Re-added perdition class
2014-09-28 14:06:07 +02:00
thatsIch
743d946496
Removed perdition class
2014-09-28 14:05:41 +02:00
thatsIch
55bb3e1fa6
Renamed BaseMJPerdition file
2014-09-28 13:56:08 +02:00
thatsIch
8c9c5bae42
Updated Submodules
2014-09-28 13:48:19 +02:00
thatsIch
4ed7173f5c
Updated submodules
2014-09-28 13:46:38 +02:00
thatsIch
3d7f847da4
Re-added typo change
2014-09-28 12:22:24 +02:00
thatsIch
12589c55db
Resolved conflicts
2014-09-28 12:22:03 +02:00
thatsIch
76b147fd5b
Improved readability of variables
...
Hopefully improved semantics of variables
Fixed typos
Added hyphenations
2014-09-28 12:21:34 +02:00
thatsIch
207758f895
resolved conflict
2014-09-28 12:11:18 +02:00
thatsIch
1e71e86acc
Removes unnecessary semicolons
2014-09-28 12:08:47 +02:00
Chris
b1bc51158f
Merge pull request #8 from Ongy/Ticket1133
...
Fix for item #1133
Fixes #133
2014-09-27 17:12:00 -07:00
Chris
0b87595f9d
Merge pull request #2 from yueh/feature-upgradeable-inscriber
...
Changed Inscriber to be upgradable with Cards
Closes #126
2014-09-27 16:50:03 -07:00
Chris
1aafe22ea9
Merge pull request #144 from thatsIch/PerformanceImprovements
...
Use collections methods to add stuff
2014-09-27 16:41:25 -07:00
Chris
b2b4ef9ce6
Merge pull request #7 from thepaperpilot/0856
...
Feature: #0856 - Crafting Terminal requires Crafting Permissions to open
Closes #76
2014-09-27 16:19:30 -07:00
Chris
876d7408be
Merge pull request #145 from AlgorithmX2/FixAddStat
...
Removed Chat Spam, replaced with Achievement.
2014-09-27 16:18:39 -07:00
AlgorithmX2
c68a4232ab
Removed Chat Spam, replaced with Achievement.
2014-09-27 17:58:48 -05:00
Chris
e159298b1a
Merge pull request #6 from thepaperpilot/0880
...
Fixed Bug: #79 - ME Chest can't be protected by ME Security Terminal.
2014-09-27 15:57:51 -07:00
thatsIch
8b4501c89d
Removes unnecessary semicolons
2014-09-28 00:50:06 +02:00
yueh
cdcae974e2
Changed Inscriber to be upgradable with Cards
...
Supports up to 3 cards
Currently max 3 Acceleration Cards, each reducing the crafting time by 25%
2014-09-28 00:36:43 +02:00
thatsIch
d37638f4ee
Use collections methods to add stuff
...
Remove redundant new String initialization
2014-09-27 23:54:17 +02:00
thatsIch
4088cca5ad
Fixing internal javadoc
2014-09-27 23:17:47 +02:00
AlgorithmX2
fed4109129
Fix a memory leak with GridStorage
2014-09-27 12:25:52 -05:00
thatsIch
7508644103
Merge pull request #10 from AlgorithmX2/CellRemovalFix
...
Close GUI when Monitor Returns a new Handler, closes Chest GUI when cell is removed
2014-09-27 12:23:21 +02:00
