thatsIch
e38293a291
Added missing javadoc return statement
2015-01-01 21:00:39 +01:00
yueh
15ba197083
Merge pull request #668 from yueh/fix-666
...
Fixes #666 Only convert to a cablebus if an IPartItem is attached
2015-01-01 15:35:57 +01:00
yueh
ff903e65a5
Fixes #666 Only convert to a cablebus if an IPartItem is attached
2014-12-31 18:21:15 +01:00
thatsIch
305fc6c7f2
Merge pull request #664 from thatsIch/b-663-disabled-facades
...
Fixes #663 NPE on disabled Facades
2014-12-30 23:34:57 +01:00
thatsIch
ada69b9a95
Fixes #663 NPE on disabled Facades
2014-12-30 23:18:38 +01:00
thatsIch
97dabc4a5c
Merge pull request #660 from thatsIch/b-659-NPE-sculpting-tool
...
Fixes #659 NPE on usage of the FZ sculpting tool
2014-12-30 14:06:08 +01:00
thatsIch
fec00fee17
Fixes #659 NPE on usage of the FZ sculpting tool
2014-12-30 11:55:47 +01:00
thatsIch
02e59faa59
Remove comment
2014-12-29 23:02:48 +01:00
thatsIch
a23a8ed165
Merge pull request #657 from yueh/organize-imports
...
Organize imports
2014-12-29 22:16:24 +01:00
yueh
9b7b0fc0fb
Organize imports
2014-12-29 21:59:05 +01:00
thatsIch
ddf71c5072
Merge pull request #611 from TheJulianJES/Log-Fix
...
Better log output at AE2 starting
2014-12-29 21:54:34 +01:00
thatsIch
2b34ba5840
Merge pull request #652 from thatsIch/b-644-NPE-on-disabled-features
...
Fixes #644 Several missing null checks when disabling huge chunks of the mod via config
2014-12-29 20:20:38 +01:00
thatsIch
3554b5f48d
Fixes #644 Several missing null checks when disabling huge chunks of the mod via config
2014-12-29 17:58:19 +01:00
thatsIch
eb74fb33b8
Merge pull request #653 from yueh/qualified-this
...
Changed access to use this qualifier
2014-12-29 15:44:27 +01:00
yueh
f471513bd0
Changed access to use this qualifier
2014-12-29 15:13:47 +01:00
thatsIch
2a5e57a59b
Merge pull request #642 from Adaptivity/patch-1
...
Update ru_RU.lang
2014-12-28 23:45:57 +01:00
Anton
e37d9099c7
Update ru_RU.lang
2014-12-28 22:24:53 +03:00
thatsIch
e712a9d8ce
Merge pull request #640 from thatsIch/b-639-crash-on-disabled-channels
...
Fixes #639 Missing null check for people with disabled channels
2014-12-28 18:38:56 +01:00
thatsIch
0cb58b4d93
Fixes #639 Missing null check for people with disabled channels
2014-12-28 18:00:04 +01:00
thatsIch
f7323289a5
Merge pull request #625 from thatsIch/b-624-pickaxe
...
Fixes #624 Missing check to disable features
2014-12-27 19:05:37 +01:00
thatsIch
366d1a0a5d
Merge pull request #629 from 61352151511/patch-1
...
Fix grammatical error
2014-12-25 14:17:29 +01:00
Mitchell
0cf33c4ea3
Fix grammatical error
...
Than = Comparison
2014-12-25 09:16:22 -04:00
thatsIch
21b70d0dda
Fixes #624 Missing check to disable features
2014-12-24 11:32:24 +01:00
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
TheJulianJES
20ccf65906
Better output log of starting
...
thatsIch wanted it ;)
2014-12-21 12:18:53 +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
