AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 03:36:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,953 Commits 29 Branches 143 Tags
Commit Graph

2953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
82e225d9f0 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-13 23:31:02 +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
b1f64a6615 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-09-13 23:30:01 +02:00
Florian Nücke
33397ec310 Fixed broken Java 1.7 runtime check. 2014-09-13 23:29:36 +02:00
Johannes Lohrer
4aab9c1f14 Merge branch 'master' of github.com:MightyPirates/OpenComputers into ExperimentalUpgrades 2014-09-13 16:21:49 +02:00
Florian Nücke
e87dffdca1 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/item/Tablet.scala
 2014-09-13 12:43:32 +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
Johannes Lohrer
a58a7176f7 added EnderIO (not sure if this is actually used yet) 
GregTech fixes
 2014-09-13 02:40:32 +02:00
Florian Nücke
7ca4aa8e26 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-11 16:38:41 +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
c394e905ed Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
	src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
 2014-09-11 16:34:32 +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
3e508b4844 Little bit of cleanup. 2014-09-10 23:40:50 +02:00
Johannes Lohrer
e0ea7e9fab added Gregtech Energy 
Removed IC2 api from sources as they are in as jar dependencies
 2014-09-10 23:29:45 +02:00
Florian Nücke
40fc4fe051 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
 2014-09-10 21:53:05 +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
12a5469ccf Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.properties
 2014-09-10 01:26:35 +02:00
Florian Nücke
604359d012 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-09-10 01:25:32 +02:00
Florian Nücke
5c7116dfb7 Revert "Non-debug libs." 
This reverts commit 32cd6fa61e832fc99f3fa893163422286a18f9b9.

Conflicts:
	build.properties
 2014-09-10 01:22:52 +02:00
Florian Nücke
5b220c9276 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-10 01:21:46 +02:00
Florian Nücke
5209cab73d Fixed rendering glitch in robot GUI. 2014-09-10 01:20:25 +02:00
Florian Nücke
1908043c11 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-09-10 01:15:44 +02:00
Florian Nücke
91a5332af0 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/server/component/robot/Player.scala
 2014-09-10 01:14:54 +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
93ecbf4e43 Split CoFH stuff up into separate submodules and using the corresponding sub-APIs' IDs to allow the drivers to work when the API is available only in part. Closes #24. 2014-09-06 18:38:37 +02:00
Florian Nücke
10fae71b4a Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.6.4 into master-MC1.7.10 
Conflicts:
	README.md
	build.gradle
 2014-09-06 17:11:53 +02:00
Florian Nücke
66ec34599a Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComponents-MC1.6.4 into MC1.7 
Conflicts:
	build.gradle
	build.properties
 2014-09-06 17:10:22 +02:00
Florian Nücke
3b15454205 Build script cleanup and improvements. 2014-09-06 17:09:24 +02:00
Florian Nücke
55d24c2366 Build script cleanup and improvements. 2014-09-06 17:07:15 +02:00
Florian Nücke
1da67a0dc6 Build script cleanup and improvements. 2014-09-06 17:06:31 +02:00
Florian Nücke
aa4601c276 Build script cleanup. 2014-09-06 16:54:57 +02:00
Florian Nücke
186596c6d1 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-09-06 01:45:38 +02:00
Florian Nücke
2cb173af18 So devvy. 2014-09-06 01:45:15 +02:00
Florian Nücke
d6b248edac Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	build.properties
 2014-09-06 01:19:12 +02:00
Florian Nücke
32cd6fa61e Non-debug libs. 2014-09-06 01:10:45 +02:00
Florian Nücke
1b4d42b480 Fixed the GT recipe set. I think. Closes #355. 2014-09-05 23:01:34 +02:00
Florian Nücke
2dd2408cbf Fixed Waila stuff. 
Using maven for Waila API.
 2014-09-05 18:19:14 +02:00
Florian Nücke
c5845ead53 Saving robot UUID. 2014-09-05 16:35:55 +02:00
Florian Nücke
632080cb92 Using UUID of player that placed a robot for that robot, may help with permission systems. 2014-09-05 15:50:06 +02:00
Florian Nücke
53bf543611 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-05 15:14:20 +02:00
Florian Nücke
b72ea5a241 Fixed a few recipes. v1.3.4 2014-09-05 15:10:16 +02:00
Florian Nücke
c7e8beece6 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-05 13:11:03 +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