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

1519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
59d7c75428 Fixed options not being passed along properly by shell.execute. 2014-04-20 22:19:12 +02:00
Florian Nücke
d0d4f502ba Made files opened in read mode seekable more reliably. 2014-04-20 22:12:00 +02:00
Florian Nücke
bbe80bc5de Fixed Abstract Bus Card in servers (broke in recent cleanup). 
Updated SGT2 API.
 2014-04-20 20:53:48 +02:00
Florian Nücke
50ddf683d2 Getting rid of tessellator, maybe that'll fix the ATI crash... read somewhere that ATI drivers derp when VBOs are used inside display lists. 2014-04-19 03:06:49 +02:00
Florian Nücke
1961d0101b Revert "Splitting up rendering of text on screens with a vertical resolution > 25 into separate display lists to see it if might help with the ATI driver crash." 
This reverts commit 774ca1268b84664fac3167b1d1972de13386b817.
 2014-04-19 02:56:23 +02:00
Florian Nücke
774ca1268b Splitting up rendering of text on screens with a vertical resolution > 25 into separate display lists to see it if might help with the ATI driver crash. 2014-04-18 14:33:04 +02:00
Florian Nücke
b3ea58c96b Fixed NPE in robot.use(). 
Fixed undirected robot commands leading to unexpected results (in particular place, which can place blocks in "adjacent" blocks if the block is replaceable), always testing into the primary facing direction first now.
 2014-04-18 14:06:45 +02:00
Florian Nücke
1bb2c76bd5 Merge pull request #211 from infinikiller64/master 
allow system to catch too long without yielding
 2014-04-17 16:42:21 +02:00
Florian Nücke
a513459f5e Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-04-17 16:32:52 +02:00
Florian Nücke
d0c620d802 Fixed math.random erroring for unit intervals. Closes #214. 2014-04-17 16:27:39 +02:00
Florian Nücke
d07f102ce7 Merge pull request #213 from KlutzLament/master 
Added a couple names to robot.names
 2014-04-17 16:15:15 +02:00
KlutzLament
c9315f57a6 Update robot.names 2014-04-16 23:59:28 -05:00
PixelToast
f49066ee20 stupid github editor is stupid 2014-04-15 19:12:53 -04:00
PixelToast
4734c179f7 allow system to catch too long without yielding 
gives system 0.5 seconds to yield before crashing.
makes it much much less annoying, and its still safe:
while true do end -> error
while true do pcall(function() while true do end end) end -> system crash
 2014-04-15 19:08:15 -04:00
Florian Nücke
f65616c42a Removed fingerprint completely to avoid confusing certain mods that decide they have to check the fingerprints of other mods... 2014-04-13 17:38:04 +02:00
Florian Nücke
757834d9b9 Forgot to disable the fingerprint check while not signing the JAR... 2014-04-13 16:04:05 +02:00
Florian Nücke
e4f5574ca8 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-04-12 14:35:56 +02:00
Florian Nücke
a647faeafd Side check in getRenderType - this could cause a server crash in 1.7, can't hurt to have it in 1.6, too. v1.2.7 2014-04-12 14:35:20 +02:00
Florian Nücke
8ceaf7d481 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-04-10 00:29:00 +02:00
Florian Nücke
44b69a4045 Allow placing item tier 1 memory (tier 1 and 1.5 RAM) into the upgrade slot of robots. 2014-04-10 00:28:20 +02:00
Florian Nücke
cd7229f23c Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/util/ItemCosts.scala
 2014-04-09 15:19:30 +02:00
Florian Nücke
c01081e6fd Localizing error messages in bluescreen, just to make sure (usually those are plain strings already anyway). 2014-04-09 15:18:23 +02:00
Florian Nücke
6b7edc5d2c Make paper terminate recipe search for item costs. 2014-04-09 15:09:16 +02:00
Florian Nücke
c2a3a5d138 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/KeyBindings.scala
	src/main/scala/li/cil/oc/util/ItemCosts.scala
 2014-04-09 15:08:24 +02:00
Florian Nücke
db5882b667 Re-using sneak keybind for extended tooltip to avoid conflict. 
Added bluescreens (show error on crash on installed GPUs' screen).
 2014-04-09 15:05:28 +02:00
Florian Nücke
9a20fd6974 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/common/item/Delegate.scala
	src/main/scala/li/cil/oc/util/ItemCosts.scala
 2014-04-09 13:09:21 +02:00
Florian Nücke
0d446cd1a8 Fixed config upgrading when coming directly from much older versions. 2014-04-09 13:00:34 +02:00
Florian Nücke
ff949f493e Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-04-08 17:19:45 +02:00
Florian Nücke
1669580cef Made extended tooltip, material cost and clipboard paste keys rebindable using MC keybinds. 
This means pasting now is only one key (no ctrl+v, sorry), but hey, it's rebindable without having to touch the config! Middle mouse button also still works because why not.
Tooltips now also tell people which key to press for the material costs info.
Inserting the name of the actually bound key in the tooltips.
 2014-04-08 17:19:31 +02:00
Florian Nücke
b38aa983a6 Merge pull request #203 from Vexatos/patch-3 
Because German. And punctuations.
 2014-04-08 13:46:08 +02:00
Vexatos
8604a58cf5 Because German. And punctuations. 
Check Vanilla localization.
 2014-04-08 13:42:57 +02:00
Florian Nücke
6de6dde999 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-04-08 12:45:44 +02:00
Florian Nücke
acff869e9a cleanup v1.2.6 2014-04-08 12:45:26 +02:00
Florian Nücke
1089e111d8 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-04-08 12:44:38 +02:00
Florian Nücke
17357fa6c3 Fixed the navigation upgrade forgetting its position. 2014-04-08 12:37:23 +02:00
Florian Nücke
4605268dc1 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-04-07 18:19:25 +02:00
Florian Nücke
58ea6ea94e Added a setting whether /tmp should be erased on *soft* reboots (computer.shutdown(true)). 
Beware: defaults to *false*, which is different from what it was up to now.
 2014-04-07 18:19:06 +02:00
Florian Nücke
b6b24c5780 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-04-07 18:08:19 +02:00
Florian Nücke
4fdf33a882 Fixed a bug in man.lua when help topic wasn't found. 
Moved dig.lua to a loot disk.
Added loot disks to creative tab. Won't show in NEI, just classic creative tab, but I'm OK with that.
 2014-04-07 18:07:39 +02:00
Florian Nücke
7208cf508b Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/Settings.scala
	src/main/scala/li/cil/oc/util/ItemCosts.scala
 2014-04-07 17:31:52 +02:00
Florian Nücke
73cbe3127b Fixed memory slot checks. 
Added creative tier case with all max-tier slots, closes #171. This case also generates an infinite amount of energy.
 2014-04-07 17:20:26 +02:00
Florian Nücke
7c615026ac Fixed bug in resolution.lua when setting to currently set resolution. 
Allowing h x w resolutions as long as h <= maxWidth and the overall area is <= maxWidth * maxHeight.
 2014-04-07 16:24:20 +02:00
Florian Nücke
7e19d2b8d7 Added tier 1.5 RAM. So many files touched, so little changed. 
Using RAM T1.5 for robots' built-in ram sizes.
 2014-04-07 03:16:20 +02:00
Florian Nücke
44c78504b9 Added hologram.copy, which is slightly more efficient than hologram.fill'ing the same area (for larger areas anyway). 
Fixed something that wasn't really a bug since it would have happened for illegal arguments anyway.
 2014-04-07 02:32:00 +02:00
Florian Nücke
0acecde4e6 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-04-06 19:19:47 +02:00
Florian Nücke
0119aa1d46 Corrected documentation on MethodWhitelist (it goes into environments, not drivers). 
Deprecated NamedBlock going into drivers, it should go into environments now (it being in drivers will no longer be supported in OC 1.3).
 2014-04-06 19:17:18 +02:00
Florian Nücke
ef5f1f7bcf Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/server/component/robot/Robot.scala
 2014-04-06 15:02:59 +02:00
Florian Nücke
3a4d88f589 Fixed color of cases and screens not being synchronized to other clients when dyed. 
Fixed some rendering glitches in robot renderer regarding equipped item.
 2014-04-06 14:55:02 +02:00
Florian Nücke
41535f9481 Merge pull request #201 from Sodiet/patch-2 
Update ru_RU.lang
 2014-04-06 12:10:33 +02:00
Rostislav
30c069b95f Update ru_RU.lang 
Updated Russian translation.

--

Обновлен перевод.
 2014-04-06 15:06:06 +06:00