Commit graph

485 commits

Author SHA1 Message Date
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