AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-10-01 00:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,538 Commits 29 Branches 143 Tags
Commit Graph

3538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
cab8085c2b Merge branch 'OC1.5-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 2015-02-20 01:45:46 +01:00
Florian Nücke
a6d7280f27 1.5 2015-02-20 01:42:42 +01:00
Florian Nücke
3f6a4d25ed Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.7.10 2015-02-20 01:42:19 +01:00
Florian Nücke
45fdcd680d Brighter highlights in NEI item list. 2015-02-20 01:40:17 +01:00
Florian Nücke
957c5e7f82 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
 2015-02-20 01:34:02 +01:00
Florian Nücke
c17eab55ea All the derpery today. 2015-02-20 01:33:12 +01:00
Florian Nücke
27715d6b6d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-20 01:29:39 +01:00
Florian Nücke
fdac72e77f Fix robot run state potentially being initialized incorrectly when playing on a server. 2015-02-20 01:28:29 +01:00
Florian Nücke
b323022e43 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
 2015-02-20 01:05:45 +01:00
Florian Nücke
6263b15c7c Fixed workaround. 2015-02-20 01:04:30 +01:00
Florian Nücke
7e10ba54e9 Fixed robot tool usage. 2015-02-20 01:00:56 +01:00
Florian Nücke
d84da8e9b5 More sidedness -.- 
Also, BlockPos.subtract is client side only? Really now?
 2015-02-20 01:00:47 +01:00
Florian Nücke
dad119cace Fixed text rendering stopping to work sometimes. Maybe. 2015-02-20 00:10:29 +01:00
Florian Nücke
880b2fd95a Fixed some items not going into disassembler. 2015-02-20 00:09:53 +01:00
Florian Nücke
82a5160b28 Fixed more sidedness and item cost computation. 2015-02-19 23:40:04 +01:00
Florian Nücke
9f767982aa Fixed some sidedness issues and fixed text on screens potentially rendering incorrectly. 2015-02-19 23:15:12 +01:00
Florian Nücke
c07c838bef Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-19 22:34:31 +01:00
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
016fed4ac0 Non-debug libs. 2015-02-16 14:35:24 +01:00
Florian Nücke
cbf776433f Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.7.10 2015-02-16 14:34:23 +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
3a274fbad4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.7.10 2015-02-14 22:34:42 +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