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,656 Commits 29 Branches 143 Tags
Commit Graph

1656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ceae60bfae Some more cleanup, pulling API initialization out of Lua architectures into separate classes. 2014-04-11 17:56:41 +02:00
Florian Nücke
5f389167ac Basics for userdata in native Lua. 2014-04-11 16:49:57 +02:00
Florian Nücke
307ceaf135 Unified node initialization some (all done in tick handler now). 
Cleaned up some, moved up sound disposal and such.
Tracking server racks in separate list to avoid looping all tile entities when opening remote terminal.
Made some more tile entities non-ticking on the client.
 2014-04-11 03:43:37 +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
Florian Nücke
aaf7bf7d79 Added texture and localization for angel upgrade. 
Removed the 'canPlaceInAir' setting.
Also checking for angel upgrade in use().
Fixed tier color not being rendered on computer case and screen when items.
 2014-04-05 21:19:31 +02:00
Florian Nücke
7ae92112c3 Merge pull request #200 from Keridos/master 
Robot upgrade to place blocks in thin air.
 2014-04-05 21:02:44 +02:00
Nico
6b0eeb66b9 renamed blockplacerairupgrade to angelUpgrade 2014-04-05 21:00:21 +02:00
Nico
0816f322ac Merge remote-tracking branch 'origin/master' 2014-04-05 19:08:43 +02:00
Nico
dc9e22641a fixed it aswell. 
moved initialization down
 2014-04-05 19:08:29 +02:00
Nico
5df9c98073 fixed it aswell. 2014-04-05 18:56:25 +02:00
Nico
930e97c884 added block placer upgrade, still does not work properly in all cases 2014-04-05 18:54:10 +02:00
Florian Nücke
39f83ae7c1 Added method whitelisting interface for drivers, to customize which methods should be shown for the blocks they support. 2014-04-05 18:44:03 +02:00
Florian Nücke
accf36757d Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-04-05 12:54:12 +02:00
Florian Nücke
c0dd2fe113 Using OreDict for dyeing screens and cases. 2014-04-05 12:53:20 +02:00
Florian Nücke
7d9b50adad Delaying connection of virtual screen and keyboard in servers used for remote terminal until at least one is actually bound to the server. 
This makes it easier to use external screens / keyboards with them, like with normal computers (without needing a startup script that binds the GPU to the right screen, e.g.)
Resetting bound terminals when server is removed.
 2014-04-05 12:52:02 +02:00
Florian Nücke
30e91bff4a Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Case.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
 2014-04-04 22:54:58 +02:00
Florian Nücke
dfe05c1d26 Made computer cases and screens dyable. 
Dye isn't consumed because ICBA to save that in the dropped blocks' NBT tag.
 2014-04-04 22:42:40 +02:00