Commit graph

1786 commits

Author SHA1 Message Date
Chris
eb894f6db8 Merge pull request #302 from yueh/cleanup-code
Code formatting
2014-10-12 15:16:38 -07:00
yueh
4978037b55 Code formatting 2014-10-13 00:11:56 +02:00
Chris
ca46de5df8 Merge pull request #301 from yueh/fix-298
Fixes duping of damaged items. #298
2014-10-12 14:59:23 -07:00
yueh
11f5594812 Fixes duping of damaged items. #298 2014-10-12 23:41:06 +02:00
yueh
0d8dada2a5 Added a checkstyle xml
The settings are mainly based on the default one plus AE2 specific
formating
Also changed to import order to a more project specific one
2014-10-11 19:37:32 +02:00
Chris
c737de91e3 Merge pull request #289 from yueh/fix-288
Fixed an off by one error in CableBusStorage
2014-10-11 07:34:11 -07:00
yueh
ae1a7ddc0f Fixed an off by one error in CableBusStorage
This will fix #269 and #288
2014-10-11 12:09:17 +02:00
Chris
52e548eebc Merge pull request #281 from thatsIch/controlflow
Simplified some control flow statements
2014-10-09 13:22:55 -07:00
Chris
cbe2ef3dfb Merge pull request #279 from thatsIch/numeric
Numeric redundancies. Could be bad when using copy paste
2014-10-09 13:22:17 -07:00
Chris
cf6efd6783 Merge pull request #280 from thatsIch/imports
Removed some imports
2014-10-09 13:21:00 -07:00
thatsIch
011ff54224 Simplified some control flow statements 2014-10-09 21:33:31 +02:00
thatsIch
54f479e827 Removed some imports 2014-10-09 21:17:48 +02:00
thatsIch
5d9d6a865a Numeric redundancies. Could be bad when using copy paste 2014-10-09 21:12:43 +02:00
yueh
fdd1a362d6 Changed TreeMap to a threadsafe implementation 2014-10-09 16:37:25 +02:00
Chris
6bc002fe63 Merge pull request #275 from thatsIch/versionchecker
Stopping versionchecker after finding the information successfully
2014-10-09 07:31:29 -07:00
thatsIch
bb865c72a4 Stopping versionchecker after finding the information successfully
Adding information about the termination of the versionchecker
2014-10-09 15:57:43 +02:00
Chris
97758d6f61 Merge pull request #270 from thatsIch/codestyle
added code-style files
2014-10-08 07:48:16 -07:00
thatsIch
d46ee9ce13 added code-style files 2014-10-08 16:39:51 +02:00
thatsIch
1b76f9977d Merge pull request #267 from AppliedEnergistics/rv2-migration
Migrate rv1 worlds to rv2 api for storage bus mode
2014-10-08 10:27:44 +02:00
Cisien
4eb70c92de Migrate rv1 worlds to rv2 api for storage bus mode 2014-10-07 15:55:18 -07:00
thatsIch
420da2b7c6 Merge pull request #261 from FireBall1725/rv2
BugFix for #260
2014-10-06 16:32:50 +02:00
FireBall1725
c017e90e87 BugFix for #260 2014-10-06 10:02:17 -04:00
Chris
dff63d25ee Merge pull request #249 from thatsIch/meaningfuliterator
Implement correct Iterator type
2014-10-05 08:56:56 -07:00
Chris
6d2f399cca Merge pull request #253 from thatsIch/craftinggridcache
Craftinggridcache
2014-10-05 08:56:29 -07:00
Chris
590b7cacdc Merge pull request #251 from thatsIch/apipart
Modifications on Apipart
2014-10-05 08:56:09 -07:00
thatsIch
da148ef787 Renames, visibility, other cleanups 2014-10-05 16:15:36 +02:00
thatsIch
f32010a538 Renamed to a more readable version 2014-10-05 15:57:30 +02:00
thatsIch
9717450f13 Added missing Type 2014-10-05 15:43:52 +02:00
thatsIch
060255e9c7 Reduce visibility of fields
Implement against interfaces
Enforce immutability instead resetting it hard via new instantiation.
2014-10-05 15:38:56 +02:00
thatsIch
d889dda406 Add correct types for classes to show that its really unknown at runtime which classes they use 2014-10-05 15:28:55 +02:00
thatsIch
6b7e821e7c lower case field 2014-10-05 15:25:36 +02:00
thatsIch
13cf7e7b50 Reduce visibility of fields 2014-10-05 15:25:09 +02:00
thatsIch
bfc14ddc54 Use correct way to check if layerInterface is in the map 2014-10-05 15:24:29 +02:00
thatsIch
016a6410aa Implement correct Iterator type 2014-10-05 12:04:20 +02:00
Chris
add0bd41e4 Merge pull request #245 from thatsIch/pathsegment
Remove redundant exception and instantiation
2014-10-04 16:43:50 -07:00
Chris
93c8460f9d Merge pull request #244 from thatsIch/pathgridcache
Fixed single loop
2014-10-04 16:42:42 -07:00
thatsIch
0b55e69eb8 Merge pull request #246 from yueh/fix-227
More optimizations to speedup interface terminals
2014-10-04 22:38:05 +02:00
yueh
9c24151a39 More optimizations to speedup interface terminals 2014-10-04 21:53:23 +02:00
thatsIch
fd59d244df Remove redundant exception and instantiation 2014-10-04 19:05:11 +02:00
thatsIch
bba04d0de9 Added missing types of collections
Fixed single loop
2014-10-04 19:00:41 +02:00
FireBall1725
810cd476d5 Merge pull request #231 from thatsIch/checkedinformation
Added type safe addInformation for the AE base class of ItemBlock with `addCheckedInformation`
2014-10-04 11:25:25 -04:00
thatsIch
c19d780979 Added type safe addInformation for the AE base class of ItemBlock with addCheckedInformation
Added type safe class reference for all energy cells
2014-10-04 15:53:55 +02:00
FireBall1725
739b4f8432 Merge pull request #239 from thatsIch/emptyif
Removed empty if cases
2014-10-04 09:38:11 -04:00
FireBall1725
eac1765def Merge pull request #240 from thatsIch/alwaystrue
Removed not needed conditions
2014-10-04 09:33:42 -04:00
thatsIch
c6bc0b36ef Merge pull request #243 from yueh/fix-242
Prevent matrix frames from being placeable
2014-10-04 15:00:26 +02:00
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
7e24f76e40 Merge pull request #238 from thatsIch/checkedinventory
Added typesafe method to obtain the inventory slots
2014-10-04 11:04:24 +02:00
thatsIch
116213d197 Added typesafe method to obtain the inventory slots 2014-10-04 10:50:53 +02:00