AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 10:51:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,671 Commits 29 Branches 143 Tags
Commit Graph

4671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
d7a6e67ab3 Fixed missing require. 2015-02-19 22:34:10 +01:00
Florian Nücke
669526c6c1 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-19 22:26:51 +01:00
Florian Nücke
a3c592a060 Drone rendering in inventories. Not quite the same as the actual model, but good enough. 2015-02-19 22:26:04 +01:00
Florian "Sangar" Nücke
abfaec747a Merge pull request #924 from magik6k/master 
Added basic hostname mechanism to OpenOS.
 2015-02-19 21:12:36 +01:00
Łukasz Magiera
cba88c7066
Improved hostname, added manpage 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-02-19 17:12:23 +01:00
Łukasz Magiera
9e4b29b4cf
Added basic hostname mechanism to OpenOS 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-02-19 00:42:50 +01:00
Florian "Sangar" Nücke
61a40b9428 Merge pull request #921 from JoshTheEnder/patch-2 
Update robot.names
 2015-02-17 23:18:03 +01:00
Josh
f648a6271f Update robot.names 
Eh, got bored
 2015-02-17 20:04:20 +00:00
Florian Nücke
e2625b7d6e State sensitive icons for tablet and terminal. 2015-02-17 16:13:00 +01:00
Florian Nücke
94c7f7a9c2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/integration/opencomputers/DriverMemory.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
 2015-02-17 14:14:24 +01:00
Florian Nücke
6e4879c1f2 Handling a few more corner-cases in network merges/address changes, hopefully closing #911 for good this time. 2015-02-17 13:35:20 +01:00
Florian Nücke
0a06096964 Fixed memory sizes in Lua architectures, closes #919. 2015-02-17 12:45:03 +01:00
Florian Nücke
0caf328c12 Fixes possible NPE in Raid tooltip, closes #918. 2015-02-17 12:39:35 +01:00
Florian Nücke
0b0ce644c7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/server/component/DebugCard.scala
 2015-02-16 23:38:00 +01:00
Florian Nücke
a0b6ff4b6d This isn't MC1.8... fixed update in tile entity env prefab. 2015-02-16 23:31:19 +01:00
Florian Nücke
4000d88231 Made debug card use actual fake player for running commands. Kinda closes #892. 2015-02-16 23:23:09 +01:00
Florian Nücke
5416ee9f55 Fixed two potential NPEs. 2015-02-16 23:21:53 +01:00
Florian Nücke
debc62a941 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-02-16 22:01:58 +01:00
Florian Nücke
aaca5c4592 Fixed dangling raid fses. 2015-02-16 22:01:45 +01:00
Florian "Sangar" Nücke
db4c6a52d2 Merge pull request #915 from magik6k/master 
Event view program for OpenOS.
 2015-02-16 21:01:48 +01:00
Łukasz Magiera
bfb1347e8c Done some suggestions in dmesg.lua 2015-02-16 20:58:46 +01:00
Florian Nücke
2fd539bbd8 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/KeyBindings.scala
	src/main/scala/li/cil/oc/common/block/Item.scala
	src/main/scala/li/cil/oc/common/item/Delegate.scala
	src/main/scala/li/cil/oc/common/item/SimpleItem.scala
 2015-02-16 20:48:19 +01:00
Florian "Sangar" Nücke
065aa0be98 Merge pull request #916 from magik6k/patch-2 
Add backwards compatibility to OpenLoader,
 2015-02-16 20:32:01 +01:00
Florian Nücke
442f519460 Floppies are colored again. Better floppy rendering in disk drives. 2015-02-16 19:32:07 +01:00
Łukasz Magiera
d71c52136f
Added backwards compatibility to OpenLoader 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-02-16 18:56:44 +01:00
Łukasz Magiera
d5f19c21d8
Added event viewing program 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-02-16 18:17:43 +01:00
Florian Nücke
fb7c2af0d0 Make key bindings support mouse buttons. Which are totally keys. Fixes #914. 2015-02-16 13:16:41 +01:00
Florian Nücke
378fc579c7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-14 22:35:04 +01:00
Florian Nücke
327fee7ca8 Fix of recent addition to sh.lua. v1.5.0-beta.1 2015-02-14 22:34:17 +01:00
Florian Nücke
03dc770188 Fixed hologram block renderer. 2015-02-14 22:24:14 +01:00
Florian Nücke
5c541641f5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-14 21:46:42 +01:00
Florian "Sangar" Nücke
539bc81c84 Merge pull request #870 from tmpvaracc/patch-1 
Update robot.names
 2015-02-14 21:45:47 +01:00
tmpvaracc
8d4bacd985 Update robot.names 
Fixed alphabet order
 2015-02-13 23:26:05 -05:00
Łukasz Magiera
4cedbb41e7
Clean io mode for sh.lua 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-02-13 19:49:13 +01:00
Florian Nücke
b09cb024a0 More rendering glitch fixing... 2015-02-13 18:03:01 +01:00
Florian Nücke
a3274bc7de Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
 2015-02-13 17:48:19 +01:00
Florian Nücke
82e57b507b Made third container in creative robot a disk drive, and added one to creative tablet. 2015-02-13 17:44:23 +01:00
Florian Nücke
6e4debf72b Underped MCU and Access Points' outer component nodes a little. 
This also means MCU is now network visible again.
 2015-02-13 16:10:06 +01:00
Florian Nücke
62afa212d5 This one's for @Vexatos. 2015-02-13 14:59:59 +01:00
Florian Nücke
d1397106ba Manually switching Lua locale to "C" for common number formatting on all systems, closes #800. 2015-02-13 14:56:53 +01:00
Florian Nücke
36056d39bd Guava hashing because it's more readable IMHO. 2015-02-13 14:47:30 +01:00
Florian Nücke
a6dcbca292 Merge branch 'world-converter' of https://github.com/benblank/OpenComputers into master-MC1.7.10 2015-02-13 14:44:35 +01:00
Florian Nücke
a648b1f250 Added not to machines' power button to use an analyzer on errors. Closes #896. 2015-02-13 14:07:06 +01:00
Florian Nücke
36ab91cdac Workaround for Mystcraft not updating total world time in client worlds. 2015-02-13 13:52:48 +01:00
Florian Nücke
29f55d8a04 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-13 13:45:52 +01:00
Florian Nücke
f7ae4bff83 Fixed leash render hook. 2015-02-13 13:45:14 +01:00
Florian Nücke
5750ec8ba1 Should fix #911, merging networks containing nodes with the same address could lead to errors if these nodes had Visibility.None. 2015-02-13 13:30:41 +01:00
Florian Nücke
4da73d42ba Fixed tablet block highlight. 2015-02-12 17:18:59 +01:00
Florian Nücke
2129fef8db Screw it, routing all the GL state stuff through own class, forcing state changes in addition to calling GlStateManager. 
Its caching is just too horribad (and I'm pretty sure that's not me anymore; aside from that, other mods may mess up the state, too, and then everything goes down the drain anyway).
 2015-02-12 17:05:13 +01:00
Florian Nücke
1ded875cbc Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/OpenComponentsPresentException.scala
	src/main/scala/li/cil/oc/client/Proxy.scala
 2015-02-12 17:03:35 +01:00