3625 Commits

Author SHA1 Message Date
Florian Nücke
d39ce433ed Might fix a memory leak. 2015-03-05 19:15:10 +01:00
Florian Nücke
f498deba26 Fix potential NPE in directory listing, should close #947. 2015-03-01 19:52:26 +01:00
Florian Nücke
f4f6881bdd Trying to prevent NPE in item cost computation. 2015-02-28 20:36:04 +01:00
Florian Nücke
56184a210a Fixed potential NPE in robot update. 2015-02-27 12:55:16 +01:00
Florian Nücke
4ceb63e5fb Fix initial color value for cables when placed as multiparts, closes #942. 2015-02-26 23:03:13 +01:00
Florian Nücke
d906ae50d8 Less ambiguous... -.- 2015-02-26 19:14:17 +01:00
Florian Nücke
142ce7edd0 Version bump. 2015-02-26 18:43:20 +01:00
Florian Nücke
6c56f76115 Fixed positioning of a few achievements.
All the text.
2015-02-26 18:34:27 +01:00
Florian Nücke
3867d3b778 Mute looping sounds while game is paused. 2015-02-26 16:48:25 +01:00
Florian Nücke
f57163cd1b More crafting achievements, achievements for assembler.
Fixed rendering of a few things in achievement screen.
Not registering old OpenOS disk with OC item registry anymore to avoid confusion.
2015-02-26 16:48:08 +01:00
Florian Nücke
6668789cf2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into Achievements
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
2015-02-26 14:05:11 +01:00
Florian Nücke
73fcf2c280 Allow recrafting robots and tablets to change their EEPROM. Closes #940. 2015-02-26 14:02:23 +01:00
Florian Nücke
87526d73fc Should fix screen input issues when NEI is installed and inventory key is bound to F. Yep. 2015-02-25 23:15:29 +01:00
Florian Nücke
a914cd2ad0 Add side check to AE node getter in case it gets called on the client.
(Which IMHO it shouldn't, but whatever.)
2015-02-25 13:38:59 +01:00
Florian Nücke
98a43ac49c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-02-25 13:24:39 +01:00
Florian "Sangar" Nücke
b6fc0bb8b9 Merge pull request #939 from magik6k/master
Improved rc script system.
2015-02-25 02:36:20 +01:00
Łukasz Magiera
dcc17687d5
Added man file for rc script system
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
2015-02-25 02:24:41 +01:00
Łukasz Magiera
20bb0a062d
Improved rc script system
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
2015-02-25 02:23:36 +01:00
Florian Nücke
93048cb7b4 Removed unused setting. 2015-02-24 15:55:24 +01:00
Florian Nücke
d1d4a8a7e5 Fixed robot tool usage.
Conflicts:
	src/main/scala/li/cil/oc/server/agent/Player.scala
2015-02-24 14:16:35 +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
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
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
21dd3aade9 Some more version bumpery. 2015-02-20 01:52:11 +01:00
Florian Nücke
c17eab55ea All the derpery today. 2015-02-20 01:33:12 +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
6263b15c7c Fixed workaround. 2015-02-20 01:04:30 +01:00
Florian Nücke
d7a6e67ab3 Fixed missing require. 2015-02-19 22:34:10 +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
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
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