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
197d94aa0d
Resolved conflicts
2014-09-28 12:24:08 +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
thatsIch
6b60a0996b
Merge branch 'master' of https://github.com/thatsIch/Applied-Energistics-2
2014-09-28 11:57:32 +02:00
thatsIch
704f2401c6
Added synching information
2014-09-28 11:54:35 +02:00
thatsIch
7580a66399
Improved readability of variables
...
Hopefully improved semantics of variables
Fixed typos
Added hyphenations
2014-09-28 11:47:17 +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
8c3ebdb721
Merge branch 'master' of https://github.com/thatsIch/Applied-Energistics-2
2014-09-27 23:57:26 +02:00
thatsIch
d37638f4ee
Use collections methods to add stuff
...
Remove redundant new String initialization
2014-09-27 23:54:17 +02:00
Chris
8a1364146f
Merge pull request #142 from thatsIch/Javadocs
...
Fixing internal javadoc
2014-09-27 14:38:54 -07:00
thatsIch
4088cca5ad
Fixing internal javadoc
2014-09-27 23:17:47 +02:00
thatsIch
76d52e365e
Added synching information
2014-09-27 21:15:39 +02:00
thatsIch
ab9f67df5a
Merge pull request #11 from AlgorithmX2/MemoryLeakFix
...
Fix a memory leak with GridStorage
2014-09-27 20:43:40 +02:00
AlgorithmX2
fed4109129
Fix a memory leak with GridStorage
2014-09-27 12:25:52 -05:00
thatsIch
c0891e4847
Changed current revision and channel to rv2-alpha. Buildnumber and branch/pr needs to be determined on TeamCity
2014-09-27 12:41:34 +02: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
thatsIch
6c0b59fcb3
Merge pull request #9 from AlgorithmX2/localizationCrashFix
...
Color Applicator - Prevent calling client only localization method on server.
2014-09-27 12:06:10 +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
thatsIch
26c18b5bc4
Updated Readme cause moved API deps to own maven
2014-09-26 23:28:32 +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
FireBall1725
9b0fc06537
Merge pull request #5 from FireBall1725/master
...
Added maven dependency support
2014-09-26 16:14:09 -04:00
FireBall1725
baf9f11b76
Delete buildcraft-dev.jar
2014-09-26 15:41:08 -04:00
FireBall1725
d1dd391a01
fixed tab
2014-09-26 15:35:46 -04:00
FireBall1725
1805ec0558
updated to use maven for the deps
2014-09-26 15:34:58 -04:00
thatsIch
9a2be4649c
Fix numerus in readme
2014-09-26 21:08:22 +02:00
Chris
356a03690f
Update README.md
2014-09-26 09:52:50 -07:00
Cisien
d16afb9ead
Merge remote-tracking branch 'origin/master'
2014-09-26 09:49:26 -07:00
Cisien
0fe26df68f
Removing 3rd party APIs, better solution coming soon
2014-09-26 09:48:30 -07:00
thatsIch
e7002b0c4d
Removed unused GT API
2014-09-26 17:07:02 +02:00
thatsIch
cb20d9a7a2
Wrong contributors link
2014-09-26 16:52:23 +02:00
thatsIch
12180df169
Update readme to match build changes
2014-09-26 16:45:39 +02:00
