Commit graph

1810 commits

Author SHA1 Message Date
thatsIch
68c6f24876 Reduce visibility of the static variables in the MA TileEntity 2014-11-03 03:06:03 +01:00
thatsIch
2835e2139d Shorten variable name to fit into the horizontal space. 2014-11-03 00:01:36 +01:00
thatsIch
19fb264b3b Fixes #376 IO Port now dropping upgrades properly. 2014-11-02 23:55:01 +01:00
thatsIch
c19ed27f0e Merge pull request #373 from yueh/fix-326
Moved getGrid() (WeakReference) to a local var
2014-11-02 12:19:18 +01:00
thatsIch
fc973d965e Merge pull request #372 from yueh/fix-366
Prevent anything but boosters inside WAPs
2014-11-02 12:18:36 +01:00
yueh
8d2f8f3369 Prevent anything but boosters inside WAPs 2014-11-02 10:52:45 +01:00
yueh
9e48eb40a0 Moved getGrid() (WeakReference) to a local var 2014-11-02 10:23:32 +01:00
thatsIch
9b18abdb3c Re-use the self-declared variable 2014-10-31 18:01:49 +01:00
thatsIch
efaa44a6f4 Add check when placing multiblocks near the sky limit or bedrock level 2014-10-31 17:26:22 +01:00
Chris
ff77462ebb Merge pull request #324 from Cisien/whitelist
Add config option to whitelist dimensions for meteorite gen
2014-10-19 07:40:02 -07:00
Cisien
9bb0722495 Fixed certus worldgen 2014-10-18 20:29:02 -07:00
Cisien
e12688516d fix merge conflict 2014-10-18 17:52:35 -07:00
Cisien
0cfa6b306a Add config option to whitelist dimensions for meteorite gen 2014-10-18 17:32:51 -07:00
thatsIch
df7aa02a11 Bumped API to rv2 2014-10-18 19:05:55 +02:00
thatsIch
d78b0f87d5 Merge pull request #311 from thatsIch/textfield
Fixes search-box click area
2014-10-18 10:03:26 +02:00
thatsIch
c82de5db8f Fixed typos in localizations 2014-10-17 12:30:57 +02:00
thatsIch
0a1e95c199 Removed outdated eclipse xml 2014-10-16 18:26:57 +02:00
thatsIch
7230485039 Updated localizations 2014-10-16 17:31:17 +02:00
thatsIch
cea2a91b31 Fixes search-box click area 2014-10-16 17:19:12 +02:00
yueh
721226abb0 Merge pull request #310 from yueh/fix-309
Fixes dupe bug. #309
2014-10-16 15:03:59 +02:00
yueh
dc30df522c Fixes dupe bug. #309 2014-10-16 14:57:43 +02:00
thatsIch
2e69571c8a Merge pull request #274 from yueh/checkstyle
Added a checkstyle xml
Updated the import sorting
2014-10-14 23:40:25 +02:00
FireBall1725
88570117bc Merge pull request #277 from yueh/fix-276
Changed TreeMap to a threadsafe implementation
2014-10-13 08:32:55 -04:00
yueh
43a80d67d8 Switched to a concurrent collection in ItemList
Replaced the TreeMap inside ItemList with a CSLM
Formated code to match the current formatting
2014-10-13 12:49:54 +02:00
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