Commit graph

1844 commits

Author SHA1 Message Date
thatsIch
608d58277f Merge pull request #605 from thatsIch/b-604-craftingcrash
Fixes #604 Crash on crafting
2014-12-22 15:24:41 +01:00
thatsIch
c790f69b90 Merge pull request #616 from thatsIch/e-572-valid-inventory
Fixes #572 Enable inventory validation for any kind of Player
2014-12-22 15:24:07 +01:00
thatsIch
72b3be0062 Fixes #572 Enable inventory validation for any kind of Player 2014-12-21 23:42:28 +01:00
thatsIch
9bd33b58e1 Merge pull request #610 from TheJulianJES/Sound-Material-Fix
Changed Sound and Material, also aligned some to vanilla
2014-12-21 13:44:03 +01:00
thatsIch
b069fa0fec Merge pull request #575 from riking/recipe-pull-player
Use player's inventory to handle NEI fills
2014-12-21 12:18:14 +01:00
TheJulianJES
689eddcba3 Changed Sounds + Materials + aligned to vanilla
Aligned it to Quartz
2014-12-21 12:05:45 +01:00
riking
60569ac221 Also use the player's inventory to handle NEI fills
If the items for a recipe are not available in the ME network when you
shift-left-click the NEI question mark, also try to pull from the
player's inventory.

The 'ic' local variable was renamed to 'testInv', as it's used to test
the IRecipe on various crafting propositions to see if the item
satisfies the recipe.

Closes #564, "Shift clicking "?" on NEI recipe ignores items in the
player's inventory".
2014-12-20 23:30:39 -08:00
thatsIch
1fc2ddedec Merge pull request #562 from thatsIch/e-561-mcversion
Solves #561 "The coremod does not have a MCVersion annotation" message
2014-12-20 23:05:30 +01:00
thatsIch
ee4f323977 More precise javadoc of IStorageCell
Reflects the internal implementation of StorageCells
2014-12-19 23:54:09 +01:00
thatsIch
48f9ca1fcb Fixes #604 Crash on crafting
The AE2 has in the contract that the item field in an IAEItemDefinition can be null due to the fact, if a special item is deactivated. This needs to be checked.

The base code was enhanced through Javadoc and split in responsibilities
2014-12-19 12:28:41 +01:00
thatsIch
fc07acbced Merge pull request #595 from thatsIch/e-593-newrfapi
Closes #593 Updating RF Integration to use version 1.7.10R1.0.2
2014-12-18 18:20:19 +01:00
thatsIch
825567c122 Closes #593 Updating RF Integration to use version 1.7.10R1.0.2
The new update contained a split of the IEnergyHandler into the IEnergyReceiver and IEnergyProvider.
Since all tiles in AE2 are basically IEnergyReceivers we use them and changed the detection of opposing tile entities from IEnergyHandler to IEnergyReceiver
2014-12-15 22:10:26 +01:00
thatsIch
8d1a0cdb7d Bump channel to beta 2014-12-15 14:59:55 +01:00
thatsIch
e0e5b89919 Update readme to reflect the api and lang repo merges
Removed recursive statement when cloning
Updated the order for building 
Clarified instruction for setup
Added information to squash commits when contributing
Format the dependencies
Added language code reference for quick look-up
2014-12-15 14:42:09 +01:00
yueh
2f7b4294c0 Merge pull request #588 from yueh/api-license
Added MIT license to all api files
2014-12-14 15:13:14 +01:00
yueh
1394fbdf3c Merge pull request #587 from yueh/readme
Closes #584 Merged api and lang READMEs
2014-12-14 15:13:05 +01:00
yueh
98098ba86e Merged api and lang READMEs 2014-12-13 01:28:32 +01:00
yueh
cab32b347b Added MIT license to all api files 2014-12-13 01:19:51 +01:00
thatsIch
2af5a17054 Merge pull request #543 from thatsIch/e-remove-submodules
Remove gitmodules
2014-12-12 21:10:05 +01:00
thatsIch
aa75482232 #561 Solves "The coremod does not have a MCVersion annotation" message 2014-12-07 23:04:37 +01:00
thatsIch
6781d38f9c Merge pull request #554 from thatsIch/b-549-rf
Fixes 549, triggers missing power event
2014-12-06 12:24:21 +01:00
thatsIch
afca362814 Fixes 549, triggers missing power event
Removed overflow calculation
2014-12-06 12:21:33 +01:00
yueh
f914d45711 Merge pull request #553 from yueh/fix-547
Fixed overstocking items with export bus/interface #547
2014-12-05 23:55:42 +01:00
thatsIch
1235f9fe27 Merge pull request #521 from thatsIch/e-grid-gen
Enhancement: Grid Work
2014-12-05 23:53:50 +01:00
thatsIch
8abf2ed8ac Basic enhancement of the grid for overall usage
has some performance improvement
replaced outdated classes
2014-12-05 23:51:01 +01:00
thatsIch
6a38893017 Merge pull request #544 from thatsIch/e-uuidmatcher
Improve performance of the UUID matcher by using a pre-compiled pattern
2014-12-05 22:55:10 +01:00
thatsIch
fb5764a409 Missing commit due to fail PR/Reset PR/force push 2014-12-05 22:53:34 +01:00
yueh
ea2037a261 Fixed overstocking items with export bus/interface 2014-12-05 22:20:31 +01:00
thatsIch
db611aff7a Improve performance of the UUID matcher by using a pre-compiled pattern 2014-12-04 16:35:20 +01:00
thatsIch
ede5fb938b Remove gitmodules
Integrate api and lang into core
2014-12-04 13:09:13 +01:00
thatsIch
d54cf458b6 Merge pull request #537 from thatsIch/b-535-cells
Remove tags in tag compound in inventories of cells if they are not needed anymore, should fix #535
2014-12-04 12:49:29 +01:00
thatsIch
36f55f12e1 Merge pull request #525 from thatsIch/b-524-rf
Uses storage knowledge to simulate the entry of RF energy, should fix #524 for BC kinesis pipe
2014-12-04 12:49:00 +01:00
thatsIch
b318041715 Uses storage knowledge to simulate the entry of RF energy, should fix #524 for BC kinesis pipe 2014-12-04 12:48:28 +01:00
yueh
00b6335a9e Merge pull request #519 from yueh/fix-348
Fixes #348 by respecting the inventory stack limit
2014-12-03 23:18:43 +01:00
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