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

3647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
b6d88b4eac Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-03-16 00:02:01 +01:00
Florian Nücke
19c9ed70b9 Changed Lua BIOS label to make it easier to find. 2015-03-16 00:01:30 +01:00
Florian Nücke
1da67180ed Fix sets not being converted properly for Lua (e.g. the result of me_controller.getCpus() was being toStringed). 2015-03-13 20:18:01 +01:00
Florian Nücke
277cc20bf7 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/BundledRedstoneAware.scala
	src/main/scala/li/cil/oc/integration/vanilla/DriverInventory.java
	src/main/scala/li/cil/oc/server/component/traits/WorldAware.scala
 2015-03-13 09:34:47 +01:00
Florian Nücke
3a20897754 Fix angel upgrade, closes #960. 2015-03-13 09:20:00 +01:00
Florian Nücke
c0690bb07f Firing PlayerInteractEvent when agents (robots, drones) are interacting with in-world inventories and in the inventory driver. See #900. 
Hopefully doesn't break anything...
 2015-03-11 15:45:29 +01:00
Florian Nücke
ffd38e59ff Allow getting array with input / output for all colors for bundled redstone. Closes #958. 
To  get this, do not pass a color value to the corresponding getter method.
Note: the returned table is zero indexed to allow treating it the same as the methods, i.e. use the `colors` library to index colors by name e.g.
 2015-03-11 14:37:13 +01:00
Florian Nücke
7a7a23ee8d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
 2015-03-09 16:49:48 +01:00
Florian Nücke
49c967cdcf Fix sound handler potentially leaking memory by keeping references to tile entities from unloaded worlds. 2015-03-09 16:41:14 +01:00
Florian Nücke
5358c8b814 Fixed screens potentially preventing chunks to unload. 2015-03-09 16:36:25 +01:00
Florian Nücke
55fa47a95c Herp derp. Corrects last commit. 2015-03-09 03:55:08 +01:00
Florian Nücke
5ec299ab5a Re-enabling RF power interface injection for #953. 2015-03-09 03:49:14 +01:00
Florian Nücke
5e644c9929 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/server/component/Keyboard.scala
 2015-03-09 03:45:36 +01:00
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
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
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
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
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