3674 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Florian Nücke	046c6f5ec8	Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 ... Conflicts: src/main/scala/li/cil/oc/common/Achievement.scala	2015-02-26 19:15:07 +01:00
Florian Nücke	d906ae50d8	Less ambiguous... -.-	2015-02-26 19:14:17 +01:00
Florian Nücke	b6837d1583	Renamed some internal constants for consistency. ... Fixed change to OpenOS disk creation in last commit / merge.	2015-02-26 19:09:06 +01:00
Florian Nücke	1e0ca602cc	Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 ... Conflicts: src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala src/main/scala/li/cil/oc/common/EventHandler.scala src/main/scala/li/cil/oc/common/Loot.scala src/main/scala/li/cil/oc/common/init/Items.scala src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala src/main/scala/li/cil/oc/common/recipe/Recipes.scala src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala src/main/scala/li/cil/oc/integration/opencomputers/DriverLootDisk.scala	2015-02-26 19:07:38 +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 Nücke	c544e3d3d8	Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8	2015-02-25 12:58:54 +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	ec725ed55a	Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 ... Conflicts: src/main/scala/li/cil/oc/server/agent/Player.scala	2015-02-24 14:18:29 +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	787638020a	Moved config to subdirectory where the recipes live.	2015-02-24 03:04:20 +01:00
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	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	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	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	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