fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 2688548479 Merge pull request #190 from yueh/feature-progress-provider thatsIch 2014-09-29 21:57:20 +02:00
  • 9e97c51746 Merge pull request #180 from thatsIch/Boxing thatsIch 2014-09-29 21:55:28 +02:00
  • 21a7d815ae Moving the handling of progress to GuiProgressBar yueh 2014-09-28 20:36:58 +02:00
  • b67eeb64e9 Added information about texture and model license thatsIch 2014-09-29 18:45:58 +02:00
  • bf5711066b Merge pull request #191 from yueh/cleanup-code thatsIch 2014-09-29 18:17:54 +02:00
  • a3705c54cd Removed unused and likely buggy class SortedList yueh 2014-09-29 17:19:51 +02:00
  • 35c00873c1 Merge pull request #188 from yueh/cleanup-code thatsIch 2014-09-29 15:41:42 +02:00
  • 5bab459b27 Update CONTRIBUTING.md thatsIch 2014-09-29 15:40:20 +02:00
  • 5d8a3d68ab Update CONTRIBUTING.md thatsIch 2014-09-29 15:39:54 +02:00
  • 5159516066 Update CONTRIBUTING.md thatsIch 2014-09-29 15:36:04 +02:00
  • 54d2e4be50 Merge pull request #189 from yueh/typos thatsIch 2014-09-29 15:28:45 +02:00
  • 7ff54c6831 Fixed typo in SyncData yueh 2014-09-29 15:25:48 +02:00
  • fd7c1ff5f8 Added checks for null and equal class to .equals() yueh 2014-09-29 12:39:40 +02:00
  • 0ee0a70f1a Removes unnecessary returns thatsIch 2014-09-29 09:47:17 +02:00
  • 3ce47a167f Removes not needed casts thatsIch 2014-09-29 09:42:50 +02:00
  • 640d888d13 Merge pull request #171 from iloveportalz0r/rv2 thatsIch 2014-09-29 09:34:07 +02:00
  • 3ae892137d Removes redundant final modifiers of private methods thatsIch 2014-09-29 09:31:45 +02:00
  • d08ce4a2b4 Deleted some parens and fixed indentation Andrew 2014-09-29 00:29:55 -07:00
  • 1d1ea7a03e Replaces String == comparison with .equals() thatsIch 2014-09-29 09:28:58 +02:00
  • b6ec21c70a Replaces while iterators with foreach call thatsIch 2014-09-29 09:26:35 +02:00
  • 5c5aaa21ee Merge remote-tracking branch 'upstream/rv2' into rv2 Andrew 2014-09-29 00:26:15 -07:00
  • caffaef835 Replaced normal for loops with foreach loops which is less error prone when just iterating over collection/array thatsIch 2014-09-29 09:23:02 +02:00
  • f95d221859 Removes not needed Boxing thatsIch 2014-09-29 09:17:33 +02:00
  • 7f52394511 Self assignment thatsIch 2014-09-29 09:14:58 +02:00
  • f49407de2c Removed redundant array creations just to match varargs operations thatsIch 2014-09-29 09:12:06 +02:00
  • 72106c877d Adding Cisien 2014-09-28 21:26:11 -07:00
  • 37ab4f2961 fix formatting Chris 2014-09-28 20:18:55 -07:00
  • a5393640ac Added some guidelines around how we will accept PRs. Chris 2014-09-28 20:11:59 -07:00
  • 62fcf26fcc Merge pull request #175 from thatsIch/TypeSafety Chris 2014-09-28 19:51:31 -07:00
  • fd18393a8b Merge remote-tracking branch 'upstream/rv2' into rv2 Andrew 2014-09-28 14:33:43 -07:00
  • 56757bd828 Fixed crafting watchers not having the right type thatsIch 2014-09-28 22:45:57 +02:00
  • f1ffbf08a2 Resolved some unchecked Types thatsIch 2014-09-28 22:20:14 +02:00
  • f63aa6d17e Merge pull request #172 from yueh/cleanup-forwarding-super thatsIch 2014-09-28 21:38:55 +02:00
  • 0f6d49fbef Removed missed ones yueh 2014-09-28 21:18:33 +02:00
  • bb3214160e Merge pull request #169 from FireBall1725/rv2 FireBall1725 2014-09-28 15:04:18 -04:00
  • 383de1f894 removed if statement that wasn't needed FireBall1725 2014-09-28 14:58:20 -04:00
  • da63aca95c Deleted unnecessary casts with Eclipse Andrew 2014-09-28 11:56:16 -07:00
  • 31434c1382 fixed bug in call to teamcity FireBall1725 2014-09-28 14:55:55 -04:00
  • 94d5319038 Fixed some warnings about unnecessary code Andrew 2014-09-28 11:55:09 -07:00
  • fed20a97fa added fix for main branch being built with the pull requests FireBall1725 2014-09-28 14:53:36 -04:00
  • da90b07194 Merge remote-tracking branch 'upstream/rv2' into rv2 Andrew 2014-09-28 11:47:59 -07:00
  • a89b9befae Merge pull request #168 from FireBall1725/rv2 FireBall1725 2014-09-28 14:42:11 -04:00
  • 12cc73a2ab removed buildcraft lib folder, handled by maven FireBall1725 2014-09-28 14:38:56 -04:00
  • d75a60cbaa Deleted unused imports Andrew 2014-09-28 11:36:14 -07:00
  • 8514e32f5f Added missing @Override annotations with Eclipse Andrew 2014-09-28 11:34:00 -07:00
  • b6273d9c0c Merge pull request #167 from yueh/cleanup-forwarding-super thatsIch 2014-09-28 20:20:32 +02:00
  • f8c7a62ce8 Merge pull request #166 from iloveportalz0r/rv2 thatsIch 2014-09-28 20:16:21 +02:00
  • 53694bdd3a Removed methods only forwarding their call to the corresponding super class yueh 2014-09-28 20:15:26 +02:00
  • a745e00115 Fixed typos in MatterCannon thatsIch 2014-09-28 19:46:10 +02:00
  • 0042176f29 Deleted redundant null checks Andrew 2014-09-28 10:41:51 -07:00
  • 8f5f3f1ed7 Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2 thatsIch 2014-09-28 19:30:34 +02:00
  • 6103376536 Merge pull request #165 from FireBall1725/rv2 FireBall1725 2014-09-28 13:25:52 -04:00
  • 75361e5f5d Added some comments FireBall1725 2014-09-28 13:18:52 -04:00
  • b3e6c89775 Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2 thatsIch 2014-09-28 19:16:27 +02:00
  • f9b9729fb5 Merge pull request #157 from thatsIch/Spelling Chris 2014-09-28 10:09:39 -07:00
  • fd0ea8b903 Merge pull request #156 from thatsIch/Semicolon Chris 2014-09-28 10:09:21 -07:00
  • 459682bd11 Merge pull request #162 from thepaperpilot/patch-2 thatsIch 2014-09-28 19:02:08 +02:00
  • 1cf54c515e Removed duplicate code The Paper Pilot 2014-09-28 11:58:21 -05:00
  • d3699f00e5 Merge pull request #161 from FireBall1725/rv2 thatsIch 2014-09-28 18:57:21 +02:00
  • 62a60469e0 Removed null teamcity code FireBall1725 2014-09-28 12:55:59 -04:00
  • 3257140b5a Oops, had a bad import at the top FireBall1725 2014-09-28 12:51:13 -04:00
  • a089438843 Added support for TeamCity adding version data Moved stub api version numbers to build.properties FireBall1725 2014-09-28 12:45:55 -04:00
  • 07c98ca67c Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2 thatsIch 2014-09-28 17:01:44 +02:00
  • 29a7ed4a62 Merge pull request #4 from Kolatra/master thatsIch 2014-09-28 14:43:08 +02:00
  • 76a515db4e Re-added perdition class thatsIch 2014-09-28 14:06:07 +02:00
  • 743d946496 Removed perdition class thatsIch 2014-09-28 14:05:41 +02:00
  • 55bb3e1fa6 Renamed BaseMJPerdition file thatsIch 2014-09-28 13:56:08 +02:00
  • 8c9c5bae42 Updated Submodules thatsIch 2014-09-28 13:48:19 +02:00
  • 4ed7173f5c Updated submodules thatsIch 2014-09-28 13:46:38 +02:00
  • 197d94aa0d Resolved conflicts thatsIch 2014-09-28 12:24:08 +02:00
  • 3d7f847da4 Re-added typo change thatsIch 2014-09-28 12:22:24 +02:00
  • 12589c55db Resolved conflicts thatsIch 2014-09-28 12:22:03 +02:00
  • 76b147fd5b Improved readability of variables thatsIch 2014-09-28 11:47:17 +02:00
  • 207758f895 resolved conflict thatsIch 2014-09-28 12:11:18 +02:00
  • 1e71e86acc Removes unnecessary semicolons thatsIch 2014-09-28 00:50:06 +02:00
  • 6b60a0996b Merge branch 'master' of https://github.com/thatsIch/Applied-Energistics-2 thatsIch 2014-09-28 11:57:32 +02:00
  • 704f2401c6 Added synching information thatsIch 2014-09-27 21:15:39 +02:00
  • 7580a66399 Improved readability of variables thatsIch 2014-09-28 11:47:17 +02:00
  • b1bc51158f Merge pull request #8 from Ongy/Ticket1133 Chris 2014-09-27 17:12:00 -07:00
  • 0b87595f9d Merge pull request #2 from yueh/feature-upgradeable-inscriber Chris 2014-09-27 16:50:03 -07:00
  • 1aafe22ea9 Merge pull request #144 from thatsIch/PerformanceImprovements Chris 2014-09-27 16:41:25 -07:00
  • b2b4ef9ce6 Merge pull request #7 from thepaperpilot/0856 Chris 2014-09-27 16:19:30 -07:00
  • 876d7408be Merge pull request #145 from AlgorithmX2/FixAddStat Chris 2014-09-27 16:18:39 -07:00
  • c68a4232ab Removed Chat Spam, replaced with Achievement. AlgorithmX2 2014-09-27 17:58:48 -05:00
  • e159298b1a Merge pull request #6 from thepaperpilot/0880 Chris 2014-09-27 15:57:51 -07:00
  • 8b4501c89d Removes unnecessary semicolons thatsIch 2014-09-28 00:50:06 +02:00
  • cdcae974e2 Changed Inscriber to be upgradable with Cards yueh 2014-09-25 22:30:19 +02:00
  • 8c3ebdb721 Merge branch 'master' of https://github.com/thatsIch/Applied-Energistics-2 thatsIch 2014-09-27 23:57:26 +02:00
  • d37638f4ee Use collections methods to add stuff Remove redundant new String initialization thatsIch 2014-09-27 23:54:17 +02:00
  • 8a1364146f Merge pull request #142 from thatsIch/Javadocs Chris 2014-09-27 14:38:54 -07:00
  • 4088cca5ad Fixing internal javadoc thatsIch 2014-09-27 23:17:47 +02:00
  • 76d52e365e Added synching information thatsIch 2014-09-27 21:15:39 +02:00
  • ab9f67df5a Merge pull request #11 from AlgorithmX2/MemoryLeakFix thatsIch 2014-09-27 20:43:40 +02:00
  • fed4109129 Fix a memory leak with GridStorage AlgorithmX2 2014-09-27 12:25:52 -05:00
  • c0891e4847 Changed current revision and channel to rv2-alpha. Buildnumber and branch/pr needs to be determined on TeamCity thatsIch 2014-09-27 12:41:34 +02:00
  • 7508644103 Merge pull request #10 from AlgorithmX2/CellRemovalFix thatsIch 2014-09-27 12:23:21 +02:00
  • 6c0b59fcb3 Merge pull request #9 from AlgorithmX2/localizationCrashFix thatsIch 2014-09-27 12:06:10 +02:00
  • 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. The Paper Pilot 2014-09-26 21:06:18 -05:00
  • 90d59db34e Close GUI when Monitor Returns a new Handler, closes Chest GUI when cell is removed. AlgorithmX2 2014-09-26 22:08:58 -05:00
  • 25b09a975e Prevent calling client only localization method on server. AlgorithmX2 2014-09-26 20:48:32 -05:00