AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 02:12:42 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,054 Commits 29 Branches 143 Tags
Commit Graph

2054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
2fbbd11d54 Let's see how horribly this will fail. 2014-09-14 01:22:19 +02:00
Florian Nücke
5561952391 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-09-13 23:30:45 +02:00
Florian Nücke
33397ec310 Fixed broken Java 1.7 runtime check. 2014-09-13 23:29:36 +02:00
Florian Nücke
1494438efe Fixed a potential error in io lib when no screen was attached. 
Made sign and nav upgrades work in tablets.
 2014-09-13 12:41:43 +02:00
Florian Nücke
3b3b872187 Fixed a massive game-breaking bug of epic proportions [/sarcasm]. 2014-09-11 16:38:22 +02:00
Florian Nücke
4e8971111b Returning number of crafted items from crafting upgrade's craft() as second result (this is the stack size of the result). Closes #561. 2014-09-11 16:22:41 +02:00
Florian Nücke
e3649a3887 Tweaked and cleaned up slot highlighting a bit, also made it available in robot GUI. 2014-09-11 16:19:36 +02:00
Florian Nücke
f0ebe7b0ee Renamed 'offset' to 'translation' to mirror general 3d/ogl terminology. 
Added x/z translation for hologram.
Added setting for max translation based on tier.
Made max translation a relative value based on the actual hologram's size (1 = 1x hologram size).
Fixed GUIs being very dark / black sometimes.
Closes #546.
 2014-09-10 20:53:26 +02:00
Florian Nücke
84de6b61ee Merge branch 'master' of https://github.com/ingie/OpenComputers 2014-09-10 19:49:29 +02:00
ingie
7fb9ad2ee6 Added hologram projection offset 2014-09-10 09:38:05 +01:00
Florian Nücke
604359d012 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-09-10 01:25:32 +02:00
Florian Nücke
106327b46d Revert "Non-debug libs." 
This reverts commit 32cd6fa61e832fc99f3fa893163422286a18f9b9.
 2014-09-10 00:58:35 +02:00
Florian Nücke
17ab2a1b1d Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-09-10 00:57:53 +02:00
Florian Nücke
dfa2cea0a6 Adding a fake network manager to robots' fake players to avoid issues with stuff trying to access that... on fake players... gah. This *should* be safe, looking at the usages and fields, but we'll see. It should at least not be more crashy than it currently is! 
Fixes #556 and partially fixes #544.
 2014-09-10 00:50:10 +02:00
Florian "Sangar" Nücke
a0349da4dd Merge pull request #554 from JoshTheEnder/patch-1 
Update robot.names
 2014-09-09 20:08:38 +02:00
Josh
0bd6eea40c Update robot.names 2014-09-09 19:04:09 +01:00
Florian Nücke
1da67a0dc6 Build script cleanup and improvements. 2014-09-06 17:06:31 +02:00
Florian Nücke
32cd6fa61e Non-debug libs. 2014-09-06 01:10:45 +02:00
Florian Nücke
b72ea5a241 Fixed a few recipes. v1.3.4 2014-09-05 15:10:16 +02:00
Florian Nücke
827f6ad4d8 Made edit create a temporary backup of the file being edited when saving, to avoid losing data when erroring while saving (e.g. out of memory). Closes #534. 2014-09-05 12:03:18 +02:00
Florian Nücke
07694cdb1f Added sanity check in player inventory layouting code for GUIs, fixes #541. 2014-09-05 11:41:39 +02:00
Florian Nücke
82d8fd8c51 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-09-04 16:59:32 +02:00
Florian Nücke
4f2b942f73 Improved parameter validation for internet.connect, closes #533. 2014-09-04 16:47:47 +02:00
Florian Nücke
9ae5fbc512 Throwing everything into main gradle file after all (sort of in preparation for submodules, since I expect it to be easier this way). 2014-09-04 16:45:12 +02:00
Florian "Sangar" Nücke
73dd99072a Merge pull request #531 from ViKaleidoscope/patch-2 
Update zh_CN.lang
 2014-09-02 16:58:12 +02:00
Crawling Mist
b36d3e46db Update zh_CN.lang 
Add translation for'Tablet Case', and change few things.
 2014-09-02 22:20:32 +08:00
Florian "Sangar" Nücke
6cf8a54cf8 Merge pull request #528 from logangorence/master 
Fixed a few small typos.
 2014-09-01 12:27:20 +02:00
Logan Gorence
26c47a6d8c Fixed a few small typos. 2014-08-31 20:44:39 -07:00
Florian Nücke
59e0191914 Fixed remote terminals being broken since a36a0b525ccaea10f27a6d3ae38f037d72c452c1. 
Fixed a race condition in tablet caching.
 2014-08-31 22:36:33 +02:00
Florian Nücke
c130594124 Some more housekeeping and a bit of recipe tweakery. 2014-08-31 08:40:42 +02:00
Florian Nücke
ce1f33c141 Housekeeping. 2014-08-31 07:21:24 +02:00
Florian Nücke
ace495ebea Added tablet template for assembler and fixed a couple of small issues related to that and tablets in general. 2014-08-30 19:59:54 +02:00
Florian Nücke
89072101f4 Fixed some slots being invisible due to the last commit. 2014-08-29 21:50:34 +02:00
Florian Nücke
0224fa262d Cleaned up a bit. 2014-08-29 21:40:39 +02:00
Florian Nücke
f6f97e0d3f Made robots have a fixed (high) number of supported components instead of basing it on the CPU, so it's fully based on the complexity when assembling now. 2014-08-29 19:16:28 +02:00
Florian Nücke
1176e7b3f0 Reworked how complexity is computed when assembling robots. Cases now only provide a base level, CPUs control the max complexity in more detail (and don't contribute to complexity themselves anymore). Closes #522. 2014-08-29 18:59:15 +02:00
Florian Nücke
3d5029caa0 Implemented template system for assembler. 2014-08-29 18:22:31 +02:00
Florian Nücke
e2365d498d Also highlight slots for items hovered in NEI. 2014-08-28 08:27:42 +02:00
Florian Nücke
6761983cd6 Highlighting slots to indicate which items can go where in most GUIs. 2014-08-28 07:54:14 +02:00
Florian Nücke
75c7318784 Fffff. 2014-08-28 00:16:57 +02:00
Florian Nücke
5e53d832af Made cables render a little socket / plug when connected to blocks and some other stuff. 2014-08-28 00:05:25 +02:00
Florian "Sangar" Nücke
a7de0a237a Merge pull request #519 from logangorence/master 
Added a few Doctor Who robot names
 2014-08-27 19:59:34 +02:00
Florian Nücke
f24c1ff170 Switched to extracting the native library into the game directory (instead of the temp directory), configurable. 2014-08-27 19:04:13 +02:00
Florian Nücke
43977a682b Avoiding (harmless) IC2 log spam on world unload. 2014-08-27 17:38:14 +02:00
Florian Nücke
82ec88fadb Avoiding potential race condition in tablets. I think. 2014-08-27 17:37:46 +02:00
Florian Nücke
7464e38302 Made holograms rotatable (only along the Y axis for now) by whacking them with a wrench. 2014-08-27 17:36:26 +02:00
Logan Gorence
b2503de177 Added a few Doctor Who robot names 
Specifically:
- Dalek Sec
- K-9
 2014-08-26 21:49:06 -07:00
Florian Nücke
02b96e5eb2 Changed robot name file parsing to allow inline # to mark rest of the line as comment (<3 Scala) and cleaned up the robot name file. 2014-08-26 19:52:34 +02:00
Florian Nücke
ac40670c4a Merge branch 'patch-1' of https://github.com/jecowa/OpenComputers 2014-08-26 19:09:11 +02:00
Florian Nücke
637fdc3c72 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-08-26 18:29:41 +02:00