Commit graph

81 commits

Author SHA1 Message Date
thatsIch 93c724443a Added harvest level of wrenches and network tools to 'wrench' 2014-09-30 15:16:33 +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