AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-22 11:52:38 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,340 Commits 29 Branches 143 Tags
Commit Graph

2340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
45f29b33e0 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-02 13:07:01 +02:00
Florian Nücke
e008949c7b Lower chunkloader cost default value as discussed, closes #447. 2014-08-02 13:06:19 +02:00
Florian Nücke
5c853ea1c0 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-01 18:22:27 +02:00
Florian Nücke
53d986312e Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-01 18:22:14 +02:00
Florian Nücke
82c60ed86d Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	src/main/resources/assets/opencomputers/lang/de_DE.lang
	src/main/resources/assets/opencomputers/lang/en_US.lang
 2014-08-01 18:21:54 +02:00
Florian Nücke
84b0abb4bf Fixed side check for server racks in internal switch mode. 2014-08-01 18:20:48 +02:00
Florian Nücke
3665e26b9f Fixed mouse scrolling working on tier one screens. 2014-08-01 17:12:36 +02:00
Florian Nücke
9be4a6dff3 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-01 16:15:09 +02:00
Florian Nücke
8eb5a95cac Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-01 16:14:51 +02:00
Florian Nücke
4987b9702d Checking for RedstoneFlux API instead of TE now, closes #455. 2014-08-01 16:14:08 +02:00
Florian Nücke
9602576678 Updated list of supported mods in info message that's displayed when no power providing mods are present. 2014-08-01 15:33:35 +02:00
Florian Nücke
bb89fd3245 Added check for ELN in power mods to avoid going into no-power mode if ELN is the only power providing mod. 
Updated list of supported mods in info message that's displayed when no power providing mods are present.
 2014-08-01 15:33:18 +02:00
Florian Nücke
9c3e7006a4 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-01 00:10:19 +02:00
Florian Nücke
9b2d201c6e Re-enabled tablets in dev branch (merging patches disabled it, gah). 2014-08-01 00:10:00 +02:00
Florian Nücke
56bf3e0c4a Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-31 19:19:54 +02:00
Florian Nücke
a4479619ad Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-31 19:18:22 +02:00
Florian Nücke
29ea616285 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-31 19:17:46 +02:00
Florian Nücke
add56c98c5 Fixed generator upgrade leaving ghost stacks (size zero) when inserting fuel, fixes #448. 2014-07-31 19:17:09 +02:00
Florian Nücke
d1efc28bd5 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-30 17:44:37 +02:00
Florian Nücke
7795507ddf Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-07-30 17:44:00 +02:00
Florian Nücke
12c1f6258c Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-30 17:43:41 +02:00
Florian Nücke
8a30c9e604 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-30 17:43:29 +02:00
Florian Nücke
8f682555ea Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-30 17:42:55 +02:00
Florian Nücke
4c576a81f9 Fixed chunk loader upgrade remaining active when robot powers down, should resolve #447. 2014-07-30 17:27:37 +02:00
Florian Nücke
28fc8b175b Fixed items that only differ in their NBT tag potentially being merged when picked up by a robot. Closes #449. 2014-07-30 17:09:28 +02:00
Florian "Sangar" Nücke
6eb4f022f6 Merge pull request #446 from mymagadsl/patch-3 
Update zh_TW.lang
 2014-07-30 14:06:40 +02:00
mymagadsl
3c1caf8754 Update zh_TW.lang 2014-07-30 01:21:03 +08:00
Florian Nücke
971624ab84 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-29 17:54:45 +02:00
Florian Nücke
267a930932 Logger adjusted for 1.7. 2014-07-29 17:54:23 +02:00
Florian Nücke
a9515b4868 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-29 17:50:07 +02:00
Florian Nücke
295c4b5763 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-29 17:49:56 +02:00
Florian Nücke
e361661c8b Implemented solution suggested by @Kilobyte22 to make component.list() return a table instead of an iterator. 2014-07-29 17:49:36 +02:00
Florian Nücke
bda75927a7 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-29 17:43:52 +02:00
Florian Nücke
3a4efdffe2 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-29 17:42:28 +02:00
Florian Nücke
395533ef14 Fixed a glitch in font texture generation, closes #444. 
Fixed crash for glyphs where the size in the Unifont differs from the expected character width.
 2014-07-29 17:39:53 +02:00
Florian Nücke
e38309df8b Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-29 14:51:19 +02:00
Florian Nücke
a5711aba3b Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/util/mods/Mods.scala
 2014-07-29 14:50:53 +02:00
Florian Nücke
e05c66e098 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-29 14:50:21 +02:00
Florian Nücke
7998bc87aa Added additional check which may or may not fix #442. 2014-07-29 14:49:53 +02:00
Florian Nücke
080b400901 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-29 14:25:16 +02:00
Florian Nücke
6d014b2257 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-29 14:25:00 +02:00
Florian Nücke
7ff9f0431c Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-29 14:24:24 +02:00
Florian Nücke
e9b49e292f Improved raytracing used for robot placement/interaction checks some and added range limit (so stuff like buckets can only be used in adjacent blocks, e.g.) 2014-07-29 14:23:18 +02:00
Florian Nücke
c5e964aecc Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-29 13:39:34 +02:00
Florian Nücke
9fc81d2fc9 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-29 13:38:56 +02:00
Florian Nücke
dd89ad8142 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-29 13:38:44 +02:00
Florian Nücke
3e62c0e0ae Fixes components in robots not being properly disconnect before the dropped item is generated, closes #441. 2014-07-29 13:37:49 +02:00
Florian Nücke
e9f9eb798a Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.properties
 2014-07-28 19:32:40 +02:00
Florian Nücke
343c0c09a0 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-28 19:30:50 +02:00
Florian Nücke
a4dc7c9ba5 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-28 19:24:39 +02:00