fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • a23a8ed165 Merge pull request #657 from yueh/organize-imports thatsIch 2014-12-29 22:16:24 +01:00
  • 9b7b0fc0fb Organize imports yueh 2014-12-29 21:59:05 +01:00
  • ddf71c5072 Merge pull request #611 from TheJulianJES/Log-Fix thatsIch 2014-12-29 21:54:34 +01:00
  • 2b34ba5840 Merge pull request #652 from thatsIch/b-644-NPE-on-disabled-features thatsIch 2014-12-29 20:20:38 +01:00
  • 3554b5f48d Fixes #644 Several missing null checks when disabling huge chunks of the mod via config thatsIch 2014-12-29 12:48:22 +01:00
  • eb74fb33b8 Merge pull request #653 from yueh/qualified-this thatsIch 2014-12-29 15:44:27 +01:00
  • f471513bd0 Changed access to use this qualifier yueh 2014-12-29 15:13:47 +01:00
  • 2a5e57a59b Merge pull request #642 from Adaptivity/patch-1 thatsIch 2014-12-28 23:45:57 +01:00
  • e37d9099c7 Update ru_RU.lang Anton 2014-12-28 22:24:53 +03:00
  • e712a9d8ce Merge pull request #640 from thatsIch/b-639-crash-on-disabled-channels rv2.beta.3 thatsIch 2014-12-28 18:38:56 +01:00
  • 0cb58b4d93 Fixes #639 Missing null check for people with disabled channels thatsIch 2014-12-28 18:00:04 +01:00
  • f7323289a5 Merge pull request #625 from thatsIch/b-624-pickaxe rv2.beta.2 thatsIch 2014-12-27 19:05:37 +01:00
  • 366d1a0a5d Merge pull request #629 from 61352151511/patch-1 thatsIch 2014-12-25 14:17:29 +01:00
  • 0cf33c4ea3 Fix grammatical error Mitchell 2014-12-25 09:16:22 -04:00
  • 21b70d0dda Fixes #624 Missing check to disable features thatsIch 2014-12-24 11:32:24 +01:00
  • 608d58277f Merge pull request #605 from thatsIch/b-604-craftingcrash thatsIch 2014-12-22 15:24:41 +01:00
  • c790f69b90 Merge pull request #616 from thatsIch/e-572-valid-inventory thatsIch 2014-12-22 15:24:07 +01:00
  • 72b3be0062 Fixes #572 Enable inventory validation for any kind of Player thatsIch 2014-12-21 23:42:28 +01:00
  • 9bd33b58e1 Merge pull request #610 from TheJulianJES/Sound-Material-Fix thatsIch 2014-12-21 13:44:03 +01:00
  • 20ccf65906 Better output log of starting TheJulianJES 2014-12-20 22:16:11 +01:00
  • b069fa0fec Merge pull request #575 from riking/recipe-pull-player thatsIch 2014-12-21 12:18:14 +01:00
  • 689eddcba3 Changed Sounds + Materials + aligned to vanilla TheJulianJES 2014-12-20 22:03:32 +01:00
  • 60569ac221 Also use the player's inventory to handle NEI fills riking 2014-12-10 11:05:01 -08:00
  • 1fc2ddedec Merge pull request #562 from thatsIch/e-561-mcversion thatsIch 2014-12-20 23:05:30 +01:00
  • ee4f323977 More precise javadoc of IStorageCell thatsIch 2014-12-19 23:54:09 +01:00
  • 48f9ca1fcb Fixes #604 Crash on crafting thatsIch 2014-12-19 12:28:41 +01:00
  • fc07acbced Merge pull request #595 from thatsIch/e-593-newrfapi thatsIch 2014-12-18 18:20:19 +01:00
  • 825567c122 Closes #593 Updating RF Integration to use version 1.7.10R1.0.2 thatsIch 2014-12-15 22:10:26 +01:00
  • 8d1a0cdb7d Bump channel to beta rv2.beta.1 thatsIch 2014-12-15 14:59:55 +01:00
  • e0e5b89919 Update readme to reflect the api and lang repo merges thatsIch 2014-12-15 14:42:09 +01:00
  • 2f7b4294c0 Merge pull request #588 from yueh/api-license yueh 2014-12-14 15:13:14 +01:00
  • 1394fbdf3c Merge pull request #587 from yueh/readme yueh 2014-12-14 15:13:05 +01:00
  • 98098ba86e Merged api and lang READMEs yueh 2014-12-13 01:26:10 +01:00
  • cab32b347b Added MIT license to all api files yueh 2014-12-13 01:19:51 +01:00
  • 2af5a17054 Merge pull request #543 from thatsIch/e-remove-submodules thatsIch 2014-12-12 21:10:05 +01:00
  • aa75482232 #561 Solves "The coremod does not have a MCVersion annotation" message thatsIch 2014-12-07 23:04:37 +01:00
  • 6781d38f9c Merge pull request #554 from thatsIch/b-549-rf thatsIch 2014-12-06 12:24:21 +01:00
  • afca362814 Fixes 549, triggers missing power event thatsIch 2014-12-05 23:28:22 +01:00
  • f914d45711 Merge pull request #553 from yueh/fix-547 yueh 2014-12-05 23:55:42 +01:00
  • 1235f9fe27 Merge pull request #521 from thatsIch/e-grid-gen thatsIch 2014-12-05 23:53:50 +01:00
  • 8abf2ed8ac Basic enhancement of the grid for overall usage thatsIch 2014-11-30 04:58:08 +01:00
  • 6a38893017 Merge pull request #544 from thatsIch/e-uuidmatcher thatsIch 2014-12-05 22:55:10 +01:00
  • fb5764a409 Missing commit due to fail PR/Reset PR/force push thatsIch 2014-12-05 22:53:34 +01:00
  • ea2037a261 Fixed overstocking items with export bus/interface yueh 2014-12-05 22:17:14 +01:00
  • db611aff7a Improve performance of the UUID matcher by using a pre-compiled pattern thatsIch 2014-12-04 16:35:20 +01:00
  • ede5fb938b Remove gitmodules thatsIch 2014-12-04 13:00:54 +01:00
  • d54cf458b6 Merge pull request #537 from thatsIch/b-535-cells thatsIch 2014-12-04 12:49:29 +01:00
  • 36f55f12e1 Merge pull request #525 from thatsIch/b-524-rf thatsIch 2014-12-04 12:49:00 +01:00
  • b318041715 Uses storage knowledge to simulate the entry of RF energy, should fix #524 for BC kinesis pipe thatsIch 2014-12-02 07:47:08 +01:00
  • 00b6335a9e Merge pull request #519 from yueh/fix-348 yueh 2014-12-03 23:18:43 +01:00
  • ca01e25f38 Remove tags in tag compound in inventories of cells if they are not needed anymore, should fix #535 thatsIch 2014-12-03 11:46:44 +01:00
  • b923ed2125 Merge pull request #532 from thatsIch/e-nexttry thatsIch 2014-12-02 23:00:44 +01:00
  • 2243c5a188 Refactoring thatsIch 2014-11-28 04:36:46 +01:00
  • 9fae9d1ec0 Merge pull request #511 from thatsIch/b-361-assembler thatsIch 2014-12-02 22:38:39 +01:00
  • c1193f7767 Try to catch assemblers being build too high or low for ChunkCache thatsIch 2014-11-28 16:51:01 +01:00
  • 00278971b1 Updated korean localization thatsIch 2014-12-01 22:26:00 +01:00
  • 78bf0ec608 Merge pull request #480 from thatsIch/uuid thatsIch 2014-11-30 14:21:38 +01:00
  • b317a8a229 Merge pull request #516 from TheJulianJES/CrankFakePlayer-Fix thatsIch 2014-11-30 14:20:55 +01:00
  • 0fad0b9ff2 Merge pull request #500 from thatsIch/enhancement-imchandler thatsIch 2014-11-29 18:04:33 +01:00
  • e1212cb609 Enhancement: put IMC handling into separate class thatsIch 2014-11-27 17:06:48 +01:00
  • cf89873447 Fixes #348 by respecting the inventory stack limit yueh 2014-11-29 17:52:34 +01:00
  • 58785428f7 Drop crank if fake player uses it TheJulianJES 2014-11-29 12:34:33 +01:00
  • 7e369937e0 Merge pull request #510 from TheJulianJES/Wail-Dev thatsIch 2014-11-28 16:35:55 +01:00
  • bc555be3c8 Added :dev to Waila Version TheJulianJES 2014-11-28 15:51:37 +01:00
  • 9600b52be5 Merge pull request #502 from thatsIch/enhancement-improve-generics thatsIch 2014-11-27 20:52:47 +01:00
  • bae7f34875 Merge pull request #501 from TheJulianJES/Sound-Fix thatsIch 2014-11-27 19:31:56 +01:00
  • bd7e48081b Fixed wrong sounds TheJulianJES 2014-11-27 18:03:10 +01:00
  • 17ce3eadc4 Enhancement: better generics thatsIch 2014-11-27 18:18:15 +01:00
  • 1aeac3b989 Merge pull request #497 from TheJulianJES/3D-Fix thatsIch 2014-11-26 21:06:58 +01:00
  • 0e74e980e3 Fixed 3D on powerd items TheJulianJES 2014-11-26 16:42:32 +01:00
  • d19b452eb7 Merge pull request #493 from thatsIch/gradle-lang thatsIch 2014-11-26 19:15:25 +01:00
  • 1b416ac596 Merge pull request #496 from mstiles92/fix-470 Chris 2014-11-26 06:43:09 -08:00
  • f4f3634b78 Use braces around if statement body. mstiles92 2014-11-26 09:29:25 -05:00
  • a57eb8d263 #470 Prevent the search box from losing focus in Auto Search and NEI Synchronized Auto Search modes. mstiles92 2014-11-26 08:19:13 -05:00
  • f26c7490c0 Should fix #492, removing the double copy thatsIch 2014-11-25 20:01:48 +01:00
  • 0ee3482dfd Updated chinese localization thatsIch 2014-11-25 18:09:32 +01:00
  • 17e996bdb8 Updated localization for stairs thatsIch 2014-11-24 07:47:37 +01:00
  • a1bc6a56ac Merge pull request #455 from thatsIch/develop thatsIch 2014-11-24 07:12:07 +01:00
  • 7a06a8bc06 Fixes #473, catches outdated player names and checks if all entries are UUIDs before converted and thus prevents the server crashing. thatsIch 2014-11-23 13:16:50 +01:00
  • cdfd886fd2 Merge pull request #427 from yueh/development thatsIch 2014-11-21 12:45:55 +01:00
  • 5693f67524 Merge pull request #467 from cjo9900/Crafting_card thatsIch 2014-11-20 12:56:08 +01:00
  • cf9f36f3e5 #466 Change Crafting card recipe to shapeless cjo9900 2014-11-19 22:46:57 +00:00
  • c364678d1b Merge pull request #464 from yueh/fix-446 thatsIch 2014-11-19 21:34:31 +01:00
  • 925e5065bc Updated brazilian, french, korean localization thatsIch 2014-11-19 21:12:41 +01:00
  • fab30a0bd3 Added a missing markDirty in AdaptorIInventory yueh 2014-11-19 20:44:18 +01:00
  • 5a0bbed9ac Merge pull request #457 from TheJulianJES/patch-5 thatsIch 2014-11-18 20:53:08 +01:00
  • 29572cfd20 Fix tiny tnt stuff TheJulianJES 2014-11-18 20:46:16 +01:00
  • 56aad10ffe Added skystone, skystone block, skystone brick, skystone small brick, certus quartz, certus quartz pillar, chiseled certus quartz and fluix stars thatsIch 2014-11-18 16:47:30 +01:00
  • 1572351a54 Merge pull request #452 from TheJulianJES/patch-4 thatsIch 2014-11-17 21:14:53 +01:00
  • bc43ec78be Fix #449 TheJulianJES 2014-11-17 21:07:42 +01:00
  • 8e59759d57 Merge pull request #432 from thatsIch/portcell thatsIch 2014-11-16 16:25:32 +01:00
  • c56c351ef8 Merge pull request #435 from thatsIch/hotfix-260 thatsIch 2014-11-15 12:48:35 +01:00
  • beddc9db50 Merge pull request #433 from thatsIch/copyright thatsIch 2014-11-15 12:47:33 +01:00
  • 0f541484de HotFix, potentially fixes #260 through catching a null node thatsIch 2014-11-14 17:56:34 +01:00
  • 7505f9b66a Added copyright to all java files thatsIch 2014-11-14 12:02:52 +01:00
  • 38b9241846 Simplified return statement thatsIch 2014-11-14 11:56:41 +01:00
  • 0066ce461d Potentially fixes #287 by removing the second call hook to open the GUI of the portable cell thatsIch 2014-11-14 11:28:33 +01:00
  • ee0e64586a Remove unused imports thatsIch 2014-11-13 22:15:06 +01:00
  • b43f520554 Fix potentially unclosed streams yueh 2014-11-13 15:32:39 +01:00
  • 364c23a1db Merge pull request #426 from thatsIch/IntegrationRegistry thatsIch 2014-11-13 15:22:40 +01:00