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

4305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
f044c5b96f Bump version number. 2015-03-09 03:40:47 +01:00
Florian Nücke
93b7dd63f7 Fixes LuaJ fallback, closes #954. 2015-03-09 03:40:34 +01:00
Mstrodl
9fa703c0f9 Update robot.names 2015-03-07 20:35:08 -05:00
Florian Nücke
d39ce433ed Might fix a memory leak. 2015-03-05 19:15:10 +01:00
Florian Nücke
1f0a00cf35 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/util/ItemCosts.scala
 2015-03-01 19:54:16 +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
a9fcfa4055 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 2015-02-27 12:58:16 +01:00
Florian Nücke
0c120022b6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-27 12:55:47 +01:00
Florian Nücke
56184a210a Fixed potential NPE in robot update. 2015-02-27 12:55:16 +01:00
Florian Nücke
e357859386 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 2015-02-27 07:14:38 +01:00
Florian Nücke
bd77abe4f9 Fixes #943. 2015-02-27 07:06:09 +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
3f9637b43a Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 
Conflicts:
	build.properties
 2015-02-26 19:17:21 +01:00
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
1ffd0fe254 Non-beta. 2015-02-25 13:00:42 +01:00
Florian Nücke
6f53ac86ab Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 2015-02-25 13:00:04 +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
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