tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
1763 commits 7 branches 98 tags 24 MiB
Commit graph

1763 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
thatsIch
8f5f3f1ed7 Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2 2014-09-28 19:30:34 +02:00
FireBall1725
6103376536 Merge pull request #165 from FireBall1725/rv2 
Added some comments
 2014-09-28 13:25:52 -04:00
FireBall1725
75361e5f5d Added some comments 2014-09-28 13:18:52 -04:00
thatsIch
b3e6c89775 Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2 2014-09-28 19:16:27 +02: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
thatsIch
459682bd11 Merge pull request #162 from thepaperpilot/patch-2 
Removed duplicate code of fuzzy button sending double to server because of super call
 2014-09-28 19:02:08 +02: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
d3699f00e5 Merge pull request #161 from FireBall1725/rv2 
Added support for TeamCity adding version data
 2014-09-28 18:57:21 +02:00
FireBall1725
62a60469e0 Removed null teamcity code 2014-09-28 12:55:59 -04:00
FireBall1725
3257140b5a Oops, had a bad import at the top 2014-09-28 12:51:13 -04:00
FireBall1725
a089438843 Added support for TeamCity adding version data 
Moved stub api version numbers to build.properties
 2014-09-28 12:45:55 -04:00
thatsIch
07c98ca67c Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2 2014-09-28 17:01:44 +02: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
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