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
