tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
2638 commits 7 branches 98 tags 24 MiB
Commit graph

930 commits

Author SHA1 Message Date
thatsIch a1b15da87a Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2 2014-11-05 19:55:00 +01:00
thatsIch 0ced725f9b Merge pull request #361 from thatsIch/tilepos 
Add check when placing multiblocks near the sky limit or bedrock level
 2014-11-05 19:20:20 +01:00
thatsIch ea64517a8e Merge pull request #378 from thatsIch/eatingIOPort 
Fixes #376 IO Port now dropping upgrades properly.
 2014-11-05 19:20:05 +01:00
thatsIch 61588fd736 Implement against interface 2014-11-05 10:21:50 +01:00
thatsIch 4e1b93b842 Use type safe base method to add information to the tooltip 2014-11-04 15:31:55 +01:00
thatsIch 8c144b22cc Simplified return 2014-11-04 15:24:03 +01:00
thatsIch 4584b5569d Specify class 2014-11-04 15:19:17 +01:00
thatsIch ded86a0170 Suppress warning for fetch out of tooltips 2014-11-04 15:18:09 +01:00
thatsIch 8a144949d6 Supress warning for using List without generic. No need for helper, since no child class overrides this yet 2014-11-04 15:16:23 +01:00
thatsIch fb006fb25a Remove not used throws 2014-11-04 12:36:16 +01:00
thatsIch 075fd1848a Finalize variables 2014-11-04 12:34:56 +01:00
thatsIch 542c1dcdbd Improved various typos 2014-11-04 12:32:33 +01:00
thatsIch fe7510d607 Rename to destination 2014-11-04 11:48:26 +01:00
thatsIch b123419486 Use type-safe version of list for AxisAlignedBB 2014-11-04 02:40:10 +01:00
thatsIch 89030ed3a4 Remove unused variables 2014-11-04 02:35:31 +01:00
thatsIch 53b7744695 Better specification which class is returned 2014-11-04 02:33:31 +01:00
thatsIch bfc8fac0dd Simplified return condition 2014-11-04 02:30:59 +01:00
thatsIch a80728de01 Use clarifying parameter names 2014-11-04 02:25:07 +01:00
thatsIch 4dcb1480f3 Remove unused parameter 2014-11-04 02:24:30 +01:00
thatsIch b569c72761 Remove unsed method 2014-11-04 02:23:22 +01:00
thatsIch b60321a9ca Simplify return statement 2014-11-04 02:22:48 +01:00
thatsIch 7d7a2ad334 Unused import 2014-11-04 02:21:20 +01:00
thatsIch f828dc11b2 Added to collection but never queried 2014-11-04 02:20:20 +01:00
thatsIch 83262093eb Adding save handle to get Entities Within AABB Excluding Entity 2014-11-04 02:18:37 +01:00
thatsIch 0622b8bb83 Simplify return logic 2014-11-04 02:07:36 +01:00
thatsIch 3eedc60e9f Explicitly stating that it is an unknown object class also here 2014-11-04 02:07:20 +01:00
thatsIch e1091d647c Explicitly stating that it is an unknown object class 2014-11-04 02:06:52 +01:00
thatsIch ff584ab627 Remove redundant array creations for calling varargs methods 2014-11-04 02:05:09 +01:00
thatsIch bff5a3ec5c Remove double negations 2014-11-04 02:01:47 +01:00
thatsIch aa15af0a08 base block now has a specified add information list 2014-11-04 01:52:04 +01:00
thatsIch f5823b6802 Reduced dependency scope of CompassReader 2014-11-04 01:46:36 +01:00
thatsIch dbbfb12cc2 Restrict view of CompassReader fields 2014-11-04 00:51:51 +01:00
thatsIch 00f67e94e4 Use constant for four hours and reuse them in the versionchecker 2014-11-04 00:47:44 +01:00
thatsIch 6d45cecbf2 Finalize version checker delay 2014-11-04 00:44:50 +01:00
thatsIch 1015214dea Removed version checker ran variable, because thread closes anyways now 2014-11-04 00:41:38 +01:00
thatsIch 1abe08cee3 Removed version checker instance 2014-11-04 00:39:59 +01:00
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
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
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 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 dc30df522c Fixes dupe bug. #309 2014-10-16 14:57:43 +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
yueh 4978037b55 Code formatting 2014-10-13 00:11:56 +02:00
yueh 11f5594812 Fixes duping of damaged items. #298 2014-10-12 23:41:06 +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
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
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
Cisien 4eb70c92de Migrate rv1 worlds to rv2 api for storage bus mode 2014-10-07 15:55:18 -07: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
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
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
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 116213d197 Added typesafe method to obtain the inventory slots 2014-10-04 10:50:53 +02:00
thatsIch cbaff9cd64 Merge pull request #237 from iloveportalz0r/rv2 
Deleted useless things
 2014-10-04 10:21:13 +02:00
Andrew 7f225a5ec1 Deleted useless things 2014-10-03 23:08:28 -07:00
The Paper Pilot 09c70ed59b Re-enabled unfocusing the search bar in AUTOSEARCH and NEI_AUTOSEARCH mode 2014-10-03 23:51:20 -05:00
Chris b8cc7fb788 Merge pull request #234 from TrinaryBrain/patch-1 
Update TileSpatialIOPort.java
 2014-10-03 17:31:43 -07:00
TrinaryBrain c39ef1640a Update TileSpatialIOPort.java 
fixed the Spatial-IO not being able to read/write custom spatial storage
 2014-10-04 00:20:51 +02:00
thatsIch 36e7b45821 added checked way to obain sub blocks 2014-10-03 17:08:25 +02:00
FireBall1725 40206a8d3f Merge pull request #216 from thatsIch/stringbuilder 
Use StringBuilder to its fullest
 2014-10-02 09:00:10 -04:00
FireBall1725 e2f9e34195 Merge pull request #226 from thatsIch/typesize 
Fixed #225 Not returning correct size per type of 8, 32, 128, 512 instead of constant 8 in BytesPerType
 2014-10-02 08:59:38 -04:00
yueh 7485ba3dc3 Fixes inscriber not dropping upgrade cards. 2014-10-02 11:05:01 +02:00
thatsIch 03047e496a Fixed #225 Not returning correct size per type of 8, 32, 128, 512 instead of constant 8 in BytesPerType 2014-10-02 10:11:01 +02:00
Chris 33ce5283d0 Merge pull request #223 from yueh/feature-129 
Optimizes the search in interface terminals
 2014-10-01 20:26:21 -07:00
Chris 7ef413ab00 Merge pull request #222 from thatsIch/ignored 
Temporary set of catch to ignored if they are ignored
 2014-10-01 20:25:52 -07:00
Chris c2fba2de55 Merge pull request #218 from thatsIch/localvars 
Remove redundant local variables
 2014-10-01 20:23:56 -07:00
yueh 287e783866 Reduced the amount of background rendering calls 2014-10-01 22:22:22 +02:00
yueh 132b36bb93 Optimizes the search in interface terminals 
Removed the amount of data by only searching the output names
Added a caching layer so every subsequent search will narrow the previous
one down and not search everything again
 2014-10-01 16:07:33 +02:00
thatsIch c074280b68 Temporary set of catch to ignored if they are ignored 2014-10-01 15:20:42 +02:00
thatsIch 33d998034d Remove static call via super 2014-10-01 15:02:44 +02:00
FireBall1725 2141aa0318 Merge pull request #217 from thatsIch/super 
Remove only redirections to super call
 2014-10-01 08:15:56 -04:00
FireBall1725 db56add2ac Merge pull request #219 from thatsIch/fmpdeprecation 
Replace deprecated method calls to FMP
 2014-10-01 08:15:24 -04:00
FireBall1725 44b61868e2 Merge pull request #220 from thatsIch/throwables 
Throw the throwables
 2014-10-01 08:14:47 -04:00
FireBall1725 7099678dc8 Merge pull request #213 from thatsIch/inverted 
Fixed #209 - Inverted damage bar
 2014-10-01 08:14:08 -04:00
FireBall1725 51fe1e14b6 Merge pull request #214 from thatsIch/imports 
Remove not needed imports
 2014-10-01 08:12:53 -04:00
thatsIch ddd998fe31 Throw the throwables 2014-10-01 11:41:52 +02:00
thatsIch c5d67997d8 Replace deprecated method calls to FMP 2014-10-01 11:39:58 +02:00
thatsIch cd064ec05c Remove redundant local variables 2014-10-01 11:34:27 +02:00
thatsIch cc9d89dc73 Remove only redirections to super call 2014-10-01 11:18:35 +02:00
thatsIch d6917fdc5b Use StringBuilder to its fullest 
Linearized append logic
 2014-10-01 11:07:13 +02:00
thatsIch 4782877e8c Added missing javadoc 2014-10-01 10:54:50 +02:00
thatsIch dedefee30b Remove not needed imports 2014-10-01 10:43:26 +02:00
thatsIch ea33c116ab Fixed #209 - Inverted damage bar 2014-10-01 10:03:52 +02:00
Chris e1627734b1 Merge pull request #207 from yueh/performance-optimizations 
Some performance or memory optimizations
 2014-09-30 15:07:13 -07:00
yueh 7fa7e43c29 Some performance or memory optimizations 
Replaced String concat in loops with StringBuilder (performance)
Replaced for with keySet + Map.get() through for with entrySet (perf)
Changed inner classes to static classes, mostly struct like (memory)
 2014-09-30 23:20:02 +02:00
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 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
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
thatsIch 29a7ed4a62 Merge pull request #4 from Kolatra/master 
Fixed #1138 replaces itemWheat with cropWheat, the oredictionaried name of MinecraftForge
 2014-09-28 14:43:08 +02:00
thatsIch 76a515db4e Re-added perdition class 2014-09-28 14:06:07 +02:00
thatsIch 743d946496 Removed perdition class 2014-09-28 14:05:41 +02:00
thatsIch 55bb3e1fa6 Renamed BaseMJPerdition file 2014-09-28 13:56:08 +02:00
thatsIch 8c9c5bae42 Updated Submodules 2014-09-28 13:48:19 +02:00
thatsIch 4ed7173f5c Updated submodules 2014-09-28 13:46:38 +02:00
thatsIch 3d7f847da4 Re-added typo change 2014-09-28 12:22:24 +02:00
thatsIch 12589c55db Resolved conflicts 2014-09-28 12:22:03 +02:00
thatsIch 76b147fd5b Improved readability of variables 
Hopefully improved semantics of variables

Fixed typos

Added hyphenations
 2014-09-28 12:21:34 +02:00
thatsIch 207758f895 resolved conflict 2014-09-28 12:11:18 +02:00
thatsIch 1e71e86acc Removes unnecessary semicolons 2014-09-28 12:08:47 +02:00
Chris b1bc51158f Merge pull request #8 from Ongy/Ticket1133 
Fix for item #1133
Fixes #133
 2014-09-27 17:12:00 -07:00
Chris 0b87595f9d Merge pull request #2 from yueh/feature-upgradeable-inscriber 
Changed Inscriber to be upgradable with Cards
Closes #126
 2014-09-27 16:50:03 -07:00
Chris 1aafe22ea9 Merge pull request #144 from thatsIch/PerformanceImprovements 
Use collections methods to add stuff
 2014-09-27 16:41:25 -07:00
Chris b2b4ef9ce6 Merge pull request #7 from thepaperpilot/0856 
Feature: #0856 - Crafting Terminal requires Crafting Permissions to open
Closes #76
 2014-09-27 16:19:30 -07:00
Chris 876d7408be Merge pull request #145 from AlgorithmX2/FixAddStat 
Removed Chat Spam, replaced with Achievement.
 2014-09-27 16:18:39 -07:00
AlgorithmX2 c68a4232ab Removed Chat Spam, replaced with Achievement. 2014-09-27 17:58:48 -05:00
Chris e159298b1a Merge pull request #6 from thepaperpilot/0880 
Fixed Bug: #79 - ME Chest can't be protected by ME Security Terminal.
 2014-09-27 15:57:51 -07:00
thatsIch 8b4501c89d Removes unnecessary semicolons 2014-09-28 00:50:06 +02:00
yueh cdcae974e2 Changed Inscriber to be upgradable with Cards 
Supports up to 3 cards
Currently max 3 Acceleration Cards, each reducing the crafting time by 25%
 2014-09-28 00:36:43 +02:00
thatsIch d37638f4ee Use collections methods to add stuff 
Remove redundant new String initialization
 2014-09-27 23:54:17 +02:00
thatsIch 4088cca5ad Fixing internal javadoc 2014-09-27 23:17:47 +02:00
AlgorithmX2 fed4109129 Fix a memory leak with GridStorage 2014-09-27 12:25:52 -05:00
thatsIch 7508644103 Merge pull request #10 from AlgorithmX2/CellRemovalFix 
Close GUI when Monitor Returns a new Handler, closes Chest GUI when cell is removed
 2014-09-27 12:23:21 +02:00
The Paper Pilot 6c9201d32b Changed the way the problem is fixed. 
Now anyone can open ME chests, but if there is a security terminal on the
network, you must have withdraw or deposit permissions in order to extract or inject
items, respectively.
 2014-09-26 22:16:25 -05:00
AlgorithmX2 90d59db34e Close GUI when Monitor Returns a new Handler, closes Chest GUI when cell is removed. 2014-09-26 22:08:58 -05:00
AlgorithmX2 25b09a975e Prevent calling client only localization method on server. 2014-09-26 20:48:32 -05:00
algorithmx2 5d57e9dff8 Remove pointless ore dictionary registration. 2014-09-26 18:12:03 -05:00
Ongy 4586c0b0d2 Fix for item #1133 2014-09-27 01:09:40 +02:00
The Paper Pilot 15f9a64ba3 Feature: #0856 - Crafting Terminal requires Crafting Permissions to open. 
Whenever a player without "craft"-ing permissions attempts to open a crafting or pattern terminal, they will open the normal terminal GUI instead
 2014-09-26 16:26:41 -05:00
The Paper Pilot a0a4f8f58d Fixed Bug: #0880 - ME Chest can't be protected by ME Security Terminal. 2014-09-26 16:07:39 -05:00
algorithmx2 181b0b0a6a Fixed Typo-s in recipes. 2014-09-26 15:15:40 -05:00
Cisien 0fe26df68f Removing 3rd party APIs, better solution coming soon 2014-09-26 09:48:30 -07:00
thatsIch 54802be11f Moved API 
Added temporary(!) API dependencies, will resolved via Maven later on
Added mcmod.info
Added pack.mcmeta template
Added hacked BC jar to use facades indev
Split build logic into several pieces
Update gitignore
Modify build.gradle to match changes
 2014-09-26 16:14:45 +02:00
Kolatra 1016510bd9 Fixed #1138 
Update process.recipe

Changed to oredictionary.

Update process.recipe

Fixed issue 1138 with oredictionary wheat.
 2014-09-25 23:17:34 -06:00
algorithmx2 86134f8fb5 Renamed Assets for typo fixes. 2014-09-25 11:46:05 -05:00
AlgorithmX2 53039cdd5f Delete AppEng.java.rej 2014-09-23 20:14:52 -05:00
AlgorithmX2 0904365956 Added Build setup and link to temporary deps. 2014-09-23 19:50:14 -05:00
AlgorithmX2 943afb01b8 Added Gradle and Readme 2014-09-23 19:30:22 -05:00
AlgorithmX2 9fdd92bec7 Added Textures. 2014-09-23 19:27:50 -05:00
AlgorithmX2 e57a5f0ad1 Added Recipes. 2014-09-23 19:27:19 -05:00
AlgorithmX2 386d18a059 Relocate Source to proper directory. 2014-09-23 19:26:27 -05:00