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

2010 commits

This branch
This branch
All branches
Author SHA1 Message Date
thatsIch ca01e25f38 Remove tags in tag compound in inventories of cells if they are not needed anymore, should fix #535 2014-12-03 11:46:44 +01:00
thatsIch b923ed2125 Merge pull request #532 from thatsIch/e-nexttry 
Refactoring, Type-safety, Minor performance improvements
 2014-12-02 23:00:44 +01:00
thatsIch 2243c5a188 Refactoring 
Type-safety

Minor performance improvements
 2014-12-02 22:55:39 +01:00
thatsIch 9fae9d1ec0 Merge pull request #511 from thatsIch/b-361-assembler 
Try to catch assemblers being build too high or low for ChunkCache
 2014-12-02 22:38:39 +01:00
thatsIch c1193f7767 Try to catch assemblers being build too high or low for ChunkCache 2014-12-02 19:36:51 +01:00
thatsIch 00278971b1 Updated korean localization 2014-12-01 22:26:00 +01:00
thatsIch 78bf0ec608 Merge pull request #480 from thatsIch/uuid 
Fixes #473, catches outdated player names and checks if all entries are UUIDs before converted and thus prevents the server crashing.
 2014-11-30 14:21:38 +01:00
thatsIch b317a8a229 Merge pull request #516 from TheJulianJES/CrankFakePlayer-Fix 
Drop the wooden crank if a fake player trys to use it
 2014-11-30 14:20:55 +01:00
thatsIch 0fad0b9ff2 Merge pull request #500 from thatsIch/enhancement-imchandler 
Enhancement: put IMC handling into separate class
 2014-11-29 18:04:33 +01:00
thatsIch e1212cb609 Enhancement: put IMC handling into separate class 
Clarify documentation
 2014-11-29 18:02:56 +01:00
yueh cf89873447 Fixes #348 by respecting the inventory stack limit 2014-11-29 17:52:34 +01:00
TheJulianJES 58785428f7 Drop crank if fake player uses it 2014-11-29 12:34:33 +01:00
thatsIch 7e369937e0 Merge pull request #510 from TheJulianJES/Wail-Dev 
Added :dev to Waila version
 2014-11-28 16:35:55 +01:00
TheJulianJES bc555be3c8 Added :dev to Waila Version 2014-11-28 15:51:37 +01:00
thatsIch 9600b52be5 Merge pull request #502 from thatsIch/enhancement-improve-generics 
Enhancement: better generics
 2014-11-27 20:52:47 +01:00
thatsIch bae7f34875 Merge pull request #501 from TheJulianJES/Sound-Fix 
Fixed sounds of Crank and CGA
 2014-11-27 19:31:56 +01:00
TheJulianJES bd7e48081b Fixed wrong sounds 
Block.class
 2014-11-27 18:28:04 +01:00
thatsIch 17ce3eadc4 Enhancement: better generics 2014-11-27 18:18:15 +01:00
thatsIch 1aeac3b989 Merge pull request #497 from TheJulianJES/3D-Fix 
Fixed 3D on powerd items
 2014-11-26 21:06:58 +01:00
TheJulianJES 0e74e980e3 Fixed 3D on powerd items 
Organized Wireless Terminal

Organized Portable Cell

Fixed something
 2014-11-26 20:21:17 +01:00
thatsIch d19b452eb7 Merge pull request #493 from thatsIch/gradle-lang 
Should fix #492, removing the double copy
 2014-11-26 19:15:25 +01:00
Chris 1b416ac596 Merge pull request #496 from mstiles92/fix-470 
Fix terminal search box losing focus in auto mode. Fixes #470
 2014-11-26 06:43:09 -08:00
mstiles92 f4f3634b78 Use braces around if statement body. 2014-11-26 09:29:25 -05:00
mstiles92 a57eb8d263 #470 Prevent the search box from losing focus in Auto Search and NEI Synchronized Auto Search modes. 
Without this patch applied there is no real difference between the auto and manual search box modes (other than whether the search box initially has focus when the GUI is opened). The search box should always have focus in auto mode, and should be able to lose focus in manual mode, as has always been the case until recently. This patch fixes the problem by preventing the search box from losing focus when in Auto and NEI Synchronized Auto search modes.
 2014-11-26 08:19:13 -05:00
thatsIch f26c7490c0 Should fix #492, removing the double copy 2014-11-25 20:01:48 +01:00
thatsIch 0ee3482dfd Updated chinese localization 2014-11-25 18:09:32 +01:00
thatsIch 17e996bdb8 Updated localization for stairs 2014-11-24 07:47:37 +01:00
thatsIch a1bc6a56ac Merge pull request #455 from thatsIch/develop 
Added skystone, skystone block, skystone brick, skystone small brick, certus quartz, certus quartz pillar, chiseled certus quartz and fluix stars, closes #52
 2014-11-24 07:12:07 +01:00
thatsIch 7a06a8bc06 Fixes #473, catches outdated player names and checks if all entries are UUIDs before converted and thus prevents the server crashing. 
Split off logic into single responsibilities for storing, initializing and matching the UUID mappings. Added JUnit to create tests for the UUID Matcher to see if its legit. It tests against simple problems like unconform UUIDs and also tests against a valid UUID.
 2014-11-23 13:43:23 +01:00
thatsIch cdfd886fd2 Merge pull request #427 from yueh/development 
Fix potentially unclosed streams
 2014-11-21 12:45:55 +01:00
thatsIch 5693f67524 Merge pull request #467 from cjo9900/Crafting_card 
#466 Change Crafting Card recipe to shapeless
 2014-11-20 12:56:08 +01:00
cjo9900 cf9f36f3e5 #466 Change Crafting card recipe to shapeless 
Change crafting card to be shapeless, to be consistent with recipe of other cards.
 2014-11-19 22:46:57 +00:00
thatsIch c364678d1b Merge pull request #464 from yueh/fix-446 
Added a missing markDirty in AdaptorIInventory to update other inventories on inserting items, fixes #446
 2014-11-19 21:34:31 +01:00
thatsIch 925e5065bc Updated brazilian, french, korean localization 2014-11-19 21:12:41 +01:00
yueh fab30a0bd3 Added a missing markDirty in AdaptorIInventory 2014-11-19 20:44:18 +01:00
thatsIch 5a0bbed9ac Merge pull request #457 from TheJulianJES/patch-5 
Fix sound, light level and hardness of tiny tnt
 2014-11-18 20:53:08 +01:00
TheJulianJES 29572cfd20 Fix tiny tnt stuff 
Fix step sound, fix hardness, fix lightning..
 2014-11-18 20:46:16 +01:00
thatsIch 56aad10ffe Added skystone, skystone block, skystone brick, skystone small brick, certus quartz, certus quartz pillar, chiseled certus quartz and fluix stars 
To integrate these into the current system, some changes to the background had to be done, especially to the feature handler. It now uses an interface to work against which you can implement to get your own feature handler instead modifying the base one and add several special cases code
 2014-11-18 16:47:30 +01:00
thatsIch 1572351a54 Merge pull request #452 from TheJulianJES/patch-4 
Fix #449 duplicate message display and attack animation
 2014-11-17 21:14:53 +01:00
TheJulianJES bc43ec78be Fix #449 
Fixing right-click animation and some other kind of duplicate items. (Like portable cell did)
 2014-11-17 21:07:42 +01:00
thatsIch 8e59759d57 Merge pull request #432 from thatsIch/portcell 
Potentially fixes #287 by removing the second call hook to open the GUI of the portable cell
 2014-11-16 16:25:32 +01:00
thatsIch c56c351ef8 Merge pull request #435 from thatsIch/hotfix-260 
HotFix, potentially fixes #260 through catching a null node
 2014-11-15 12:48:35 +01:00
thatsIch beddc9db50 Merge pull request #433 from thatsIch/copyright 
Added copyright to all java files
 2014-11-15 12:47:33 +01:00
thatsIch 0f541484de HotFix, potentially fixes #260 through catching a null node 
Added copyright
Reformatted code
Rearranged code
 2014-11-14 17:56:34 +01:00
thatsIch 7505f9b66a Added copyright to all java files 2014-11-14 12:03:00 +01:00
thatsIch 38b9241846 Simplified return statement 
Added copyright
Reformatted code
Rearranged code
 2014-11-14 11:56:41 +01:00
thatsIch 0066ce461d Potentially fixes #287 by removing the second call hook to open the GUI of the portable cell 
Added copyrights
Reformated code
Rearranged code
 2014-11-14 11:28:33 +01:00
thatsIch ee0e64586a Remove unused imports 2014-11-13 22:16:23 +01:00
yueh b43f520554 Fix potentially unclosed streams 
Simplified some file checks
Code formatting and added copyright
 2014-11-13 15:42:14 +01:00
thatsIch 364c23a1db Merge pull request #426 from thatsIch/IntegrationRegistry 
Changed the integration registry into a real singleton independent about its instantiation by other classes
 2014-11-13 15:22:40 +01:00