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

192 commits

Author SHA1 Message Date
yueh
494584ac8b Prevent matrix frames from being placeable 
Formated code and organized imports
 2014-10-04 14:57:39 +02:00
thatsIch
54ecc29758 Removed not needed conditions 2014-10-04 11:14:33 +02:00
thatsIch
f6b6e4d804 Removed empty if cases 2014-10-04 11:10:08 +02:00
thatsIch
116213d197 Added typesafe method to obtain the inventory slots 2014-10-04 10:50:53 +02:00
thatsIch
cbaff9cd64 Merge pull request #237 from iloveportalz0r/rv2 
Deleted useless things
 2014-10-04 10:21:13 +02:00
Andrew
7f225a5ec1 Deleted useless things 2014-10-03 23:08:28 -07:00
The Paper Pilot
09c70ed59b Re-enabled unfocusing the search bar in AUTOSEARCH and NEI_AUTOSEARCH mode 2014-10-03 23:51:20 -05:00
Chris
b8cc7fb788 Merge pull request #234 from TrinaryBrain/patch-1 
Update TileSpatialIOPort.java
 2014-10-03 17:31:43 -07:00
TrinaryBrain
c39ef1640a Update TileSpatialIOPort.java 
fixed the Spatial-IO not being able to read/write custom spatial storage
 2014-10-04 00:20:51 +02:00
thatsIch
36e7b45821 added checked way to obain sub blocks 2014-10-03 17:08:25 +02:00
FireBall1725
40206a8d3f Merge pull request #216 from thatsIch/stringbuilder 
Use StringBuilder to its fullest
 2014-10-02 09:00:10 -04:00
FireBall1725
e2f9e34195 Merge pull request #226 from thatsIch/typesize 
Fixed #225 Not returning correct size per type of 8, 32, 128, 512 instead of constant 8 in BytesPerType
 2014-10-02 08:59:38 -04:00
yueh
7485ba3dc3 Fixes inscriber not dropping upgrade cards. 2014-10-02 11:05:01 +02:00
thatsIch
03047e496a Fixed #225 Not returning correct size per type of 8, 32, 128, 512 instead of constant 8 in BytesPerType 2014-10-02 10:11:01 +02:00
Chris
33ce5283d0 Merge pull request #223 from yueh/feature-129 
Optimizes the search in interface terminals
 2014-10-01 20:26:21 -07:00
Chris
7ef413ab00 Merge pull request #222 from thatsIch/ignored 
Temporary set of catch to ignored if they are ignored
 2014-10-01 20:25:52 -07:00
Chris
c2fba2de55 Merge pull request #218 from thatsIch/localvars 
Remove redundant local variables
 2014-10-01 20:23:56 -07:00
yueh
287e783866 Reduced the amount of background rendering calls 2014-10-01 22:22:22 +02:00
yueh
132b36bb93 Optimizes the search in interface terminals 
Removed the amount of data by only searching the output names
Added a caching layer so every subsequent search will narrow the previous
one down and not search everything again
 2014-10-01 16:07:33 +02:00
thatsIch
c074280b68 Temporary set of catch to ignored if they are ignored 2014-10-01 15:20:42 +02:00
thatsIch
33d998034d Remove static call via super 2014-10-01 15:02:44 +02:00
FireBall1725
2141aa0318 Merge pull request #217 from thatsIch/super 
Remove only redirections to super call
 2014-10-01 08:15:56 -04:00
FireBall1725
db56add2ac Merge pull request #219 from thatsIch/fmpdeprecation 
Replace deprecated method calls to FMP
 2014-10-01 08:15:24 -04:00
FireBall1725
44b61868e2 Merge pull request #220 from thatsIch/throwables 
Throw the throwables
 2014-10-01 08:14:47 -04:00
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