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 |
|
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
|
0ee0a70f1a
|
Removes unnecessary returns
|
2014-09-29 09:47:17 +02:00 |
|
thatsIch
|
3ce47a167f
|
Removes not needed casts
|
2014-09-29 09:42:50 +02:00 |
|
thatsIch
|
640d888d13
|
Merge pull request #171 from iloveportalz0r/rv2
Fixed lots of warnings (mostly redundant code)
|
2014-09-29 09:34:07 +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 |
|
Cisien
|
72106c877d
|
Adding
|
2014-09-28 21:26:11 -07:00 |
|
Chris
|
37ab4f2961
|
fix formatting
|
2014-09-28 20:18:55 -07:00 |
|
Chris
|
a5393640ac
|
Added some guidelines around how we will accept PRs.
|
2014-09-28 20:11:59 -07: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 |
|
FireBall1725
|
bb3214160e
|
Merge pull request #169 from FireBall1725/rv2
added fix for main branch being built with the pull requests
|
2014-09-28 15:04:18 -04:00 |
|
FireBall1725
|
383de1f894
|
removed if statement that wasn't needed
|
2014-09-28 14:58:20 -04:00 |
|
Andrew
|
da63aca95c
|
Deleted unnecessary casts with Eclipse
|
2014-09-28 11:56:16 -07:00 |
|
FireBall1725
|
31434c1382
|
fixed bug in call to teamcity
|
2014-09-28 14:55:55 -04:00 |
|
Andrew
|
94d5319038
|
Fixed some warnings about unnecessary code
|
2014-09-28 11:55:09 -07:00 |
|
FireBall1725
|
fed20a97fa
|
added fix for main branch being built with the pull requests
|
2014-09-28 14:53:36 -04:00 |
|
Andrew
|
da90b07194
|
Merge remote-tracking branch 'upstream/rv2' into rv2
|
2014-09-28 11:47:59 -07:00 |
|
FireBall1725
|
a89b9befae
|
Merge pull request #168 from FireBall1725/rv2
removed buildcraft lib folder, handled by maven
|
2014-09-28 14:42:11 -04:00 |
|
FireBall1725
|
12cc73a2ab
|
removed buildcraft lib folder, handled by maven
|
2014-09-28 14:38:56 -04: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 |
|