Commit graph

1598 commits

Author SHA1 Message Date
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
6a8effe2b0 Merge pull request #196 from Akai1/patch-1
Update Forge, FMP and WAILA
2014-09-30 15:02:31 +02:00
Akai1
6ba45538f4 Update Forge, FMP and WAILA 2014-09-30 14:45:51 +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
FireBall1725
c0b2664331 this is what happens when i dont verify the forge version on the website 2014-09-29 21:10:01 -04:00
FireBall1725
99ad4dc61d Downgraded forge to 1208 to fix compatiblity with forge multiparts 2014-09-29 21:06:27 -04:00
Chris
9f37039dba Merge pull request #193 from FireBall1725/rv2
Added how to submit issues to the readme, updated in contrib
2014-09-29 18:05:13 -07:00
FireBall1725
5be4766c2c Added how to submit issues to the readme, updated in contrib 2014-09-29 21:00:30 -04:00
Chris
253085185f Merge pull request #186 from thatsIch/Return
Removes unnecessary returns
2014-09-29 17:58:58 -07:00
Chris
cb5f1bc19c Merge pull request #181 from thatsIch/Foreach
Replaced normal for loops with foreach loops which is less error prone w...
2014-09-29 17:57:13 -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
fd1f3bb03f Merge branch 'Return' of https://github.com/thatsIch/Applied-Energistics-2 into Return 2014-09-29 23:27:51 +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
thatsIch
b67eeb64e9 Added information about texture and model license 2014-09-29 18:45:58 +02:00
thatsIch
bf5711066b Merge pull request #191 from yueh/cleanup-code
Removed unused and likely buggy class SortedList
2014-09-29 18:17:54 +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
thatsIch
5bab459b27 Update CONTRIBUTING.md
And for pastebin
2014-09-29 15:40:20 +02:00
thatsIch
5d8a3d68ab Update CONTRIBUTING.md
Removed urls cause they were not parsed in ```sections
2014-09-29 15:39:54 +02:00
thatsIch
5159516066 Update CONTRIBUTING.md 2014-09-29 15:36:04 +02:00
thatsIch
54d2e4be50 Merge pull request #189 from yueh/typos
Fixed typo in SyncData
2014-09-29 15:28:45 +02:00
yueh
7ff54c6831 Fixed typo in SyncData 2014-09-29 15:25:48 +02:00