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

3768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
412569f817 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Microcontroller.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/item/EEPROM.scala
 2015-02-24 02:44:21 +01:00
Florian Nücke
4f5bfe184a Fixed creative items derping in creative tab when switching worlds (e.g. joining server after having been in a single player world). 2015-02-24 02:38:59 +01:00
Florian Nücke
a6f74272c5 Allow swapping EEPROM in MCU by shift-rightclicking the block with the EEPROM to insert in hand. Closes #920. 2015-02-24 02:33:12 +01:00
Florian Nücke
cefa0464dc Made inventory trait a bit more flexible. 2015-02-24 02:31:13 +01:00
Florian Nücke
b34ec529bd Fixed slot offset in crafting upgrade. 
Reworked code adding stuff to player inventories a bit to ensure it gets properly synced to clients.
 2015-02-24 02:30:42 +01:00
Florian Nücke
542f6fde0c 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
	src/main/scala/li/cil/oc/common/event/RobotCommonHandler.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/PowerInformation.scala
 2015-02-23 17:48:49 +01:00
Florian Nücke
59fba896b4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
 2015-02-23 17:46:41 +01:00
Florian Nücke
507b882f47 Backported change to robot movement / execution logic so that it runs in a tick handler instead of the tile entity's update method. 
May help with issue #808 or break things horribly (not that I've seen any indication of the latter in the tests I did).
 2015-02-23 17:45:29 +01:00
Florian Nücke
d4e084e0d0 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/common/event/RobotCommonHandler.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/PowerInformation.scala
 2015-02-23 17:17:56 +01:00
Florian Nücke
e96348f665 Added note wrt. tablets in chargers to charger tooltip. 2015-02-23 15:38:50 +01:00
Florian Nücke
e83e572854 Force periodically sending power info if it changed at all to avoid incorrect values being displayed when 100% is hit when charging, e.g., closes #932. 2015-02-23 15:02:29 +01:00
Florian Nücke
28aeaf4313 Fixed typos / information in manpages, closes #928. 2015-02-23 14:39:28 +01:00
Florian Nücke
e1fe125989 Added fix I forgot to backport, fixes broken flight height computation. Closes #927. 2015-02-21 16:05:41 +01:00
Florian Nücke
a24d31e1fa Bump version. 2015-02-20 21:11:46 +01:00
Florian Nücke
b6dbef7095 Wrap external NBT loading with try-catch to avoid corrupting block if external NBT data is corrupt. Closes #926. 2015-02-20 21:11:28 +01:00
Florian Nücke
a8b8b82f96 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 2015-02-20 02:31:33 +01:00
Florian Nücke
d24eff48d8 Yay case sensitivity. 2015-02-20 02:28:30 +01:00
Florian Nücke
c77947c782 Trying to fix some rendering glitches. 2015-02-20 02:17:46 +01:00
Florian Nücke
7947cc4195 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 2015-02-20 01:54:29 +01:00
Florian Nücke
4f1e18b3a8 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-20 01:53:55 +01:00
Florian Nücke
4de62c1467 Cleanup. 2015-02-20 01:53:40 +01:00
Florian Nücke
21dd3aade9 Some more version bumpery. 2015-02-20 01:52:11 +01:00
Florian Nücke
7f107f53cc 1.8 is still beta. 2015-02-20 01:46:30 +01:00
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