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

3459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
c87d09f076 Saving robot rotation might be a good idea. 2015-01-29 18:17:23 +01:00
Florian Nücke
9dd89ba235 Fixed TESR's occasionally not rendering correctly. 2015-01-29 14:59:39 +01:00
Florian Nücke
1a4202eda2 Adjusted for earlier refactoring. 2015-01-29 13:35:56 +01:00
Florian Nücke
6de6dfbb83 Revert "Killed remote terminals. More power to tablets!" 
This reverts commit a804769abd49c2566e15cf25713b66de36e28bef.

Conflicts:
	src/main/resources/assets/opencomputers/lang/en_US.lang
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/item/Server.scala
 2015-01-29 13:27:09 +01:00
Florian "Sangar" Nücke
ad6a1cced9 That's not the wiki. 2015-01-29 13:05:36 +01:00
Ben Blank
4b94b61faf make the Sides API less suprising when used with the # operator and ipairs function 2015-01-28 17:46:22 -08:00
Florian Nücke
ee6a2d9d08 1.8 adjustments. 2015-01-29 01:43:10 +01:00
Florian Nücke
d1f7899c4c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-01-29 01:40:53 +01:00
Florian Nücke
aeafac4df3 Added debug.removeItem for removing items from inventories. Closes #866. 2015-01-29 00:11:58 +01:00
Florian Nücke
2f9779cb76 Added play and stop methods to jukebox driver. Closes #862. 2015-01-28 23:27:38 +01:00
Florian Nücke
78d6ea15d2 Added setting for whether to enable command block driver or not; defaulting to false. 2015-01-28 22:17:01 +01:00
Florian Nücke
e9d74f21a7 Hallelujah! Robot movement works again. 
Updating robots from tick handler now, to ensure tile entities are set immediately.
Also making rotatable trait for tile entities "hybrid" so it can use either metadata *or* its own data.
 2015-01-28 21:17:31 +01:00
Florian Nücke
19f614a3eb Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.gradle
	build.properties
	src/main/java/li/cil/oc/api/API.java
	src/main/scala/li/cil/oc/client/Sound.scala
	src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
	src/main/scala/li/cil/oc/common/block/Adapter.scala
	src/main/scala/li/cil/oc/common/block/Assembler.scala
	src/main/scala/li/cil/oc/common/block/Capacitor.scala
	src/main/scala/li/cil/oc/common/block/Case.scala
	src/main/scala/li/cil/oc/common/block/Charger.scala
	src/main/scala/li/cil/oc/common/block/Disassembler.scala
	src/main/scala/li/cil/oc/common/block/DiskDrive.scala
	src/main/scala/li/cil/oc/common/block/Item.scala
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/block/Microcontroller.scala
	src/main/scala/li/cil/oc/common/block/Raid.scala
	src/main/scala/li/cil/oc/common/block/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/block/ServerRack.scala
	src/main/scala/li/cil/oc/common/block/SimpleBlock.scala
	src/main/scala/li/cil/oc/common/block/Switch.scala
	src/main/scala/li/cil/oc/common/block/traits/SpecialBlock.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
	src/main/scala/li/cil/oc/common/entity/Drone.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala
	src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
	src/main/scala/li/cil/oc/common/tileentity/Redstone.scala
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
	src/main/scala/li/cil/oc/server/component/Redstone.scala
	src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala
	src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
	src/main/scala/li/cil/oc/util/ItemCosts.scala
	src/main/scala/li/cil/oc/util/ItemUtils.scala
 2015-01-28 18:04:34 +01:00
Florian Nücke
a218b27e3a Fixed a typo and made some docstrings more generic. 2015-01-27 14:22:32 +01:00
Florian Nücke
1fe6b51e1c Because OCD. 2015-01-27 14:21:38 +01:00
Florian Nücke
b85695e800 Merge branch 'patch-1' of https://github.com/Ivoah/OpenComputers into master-MC1.7.10 2015-01-27 14:20:49 +01:00
Florian Nücke
a0f11d36b5 Re-enabled inventory_controller.getInventorySize(sides.back) for backwards compatibility. Will be removed in 1.5, use robot.inventorySize(). Closes #860. 2015-01-27 13:57:33 +01:00
Florian Nücke
8da121964b Fixed Connector.setLocalBufferSize registering self before adjusting size, leading to manager not adding it to the connector list if its size was zero before. Fixes #859. 2015-01-27 13:48:51 +01:00
Florian Nücke
b3cd8cb734 Should fix #853. 2015-01-27 02:09:31 +01:00
Ivoah
8b8ee1cb88 Make port number optional in irc.lua 2015-01-26 08:30:13 -05:00
Kővágó, Zoltán
b051b10c18 Fix InventoryUtils.insertIntoInventory 
According to the documentation inventory_controller.suckFromSlot, robot.suck and
friends try to put the sucked item into the selected slot, and only if it's
occupied try others. However the implementation first tried to merge the stack
with existing stacks in the inventory, and only if it failed put into the
selected slot. This commit fixes it.
 2015-01-25 21:45:26 +01:00
Florian Nücke
43193a59c6 Avoid skipping physical removal in filesystem.remove when a virtual object had to be removed for deleting a directory. Closes #849. 2015-01-25 13:37:31 +01:00
Florian Nücke
dbf99cdf4e Fixes error with AE2 rv2 caused by use of wrong API class. Closes #847. 2015-01-24 20:35:29 +01:00
Florian Nücke
c5e114e0ae Added try-catch around Keyboard.* calls because they can apparently error if something is misconfigured somewhere. Closes #846. v1.4.6 2015-01-24 19:00:42 +01:00
Florian Nücke
c6042b682d Version bump. 2015-01-24 18:54:19 +01:00
Florian Nücke
f0af06144e Allow binding debug card to a player to use the player's permissions for runCommand by shift-rightclicking it while holding it. Closes #843. 2015-01-24 18:54:04 +01:00
Florian Nücke
080c485c05 AE2 controller integration now works via interface block if channels are disabled (meaning controller block won't be available). Closes #791. 2015-01-24 16:19:12 +01:00
Florian Nücke
40bbac10c6 Preloading sounds, reduces lag on clientside when first starting a computer some. 2015-01-24 15:27:20 +01:00
Florian Nücke
603f23a0fb May fix duplicates in dev jars on Jenkins. Or break everything. 2015-01-23 20:42:13 +01:00
Florian Nücke
6156ccc1ef Added interface to allow controlling on which sides SimpleComponents can be connected. Closes #844. 2015-01-22 21:52:29 +01:00
Florian Nücke
068159cdf5 Added preconfigured Tablet to NEI, missed that when adding the other preconfigured stuff. 2015-01-22 21:13:55 +01:00
Florian Nücke
dfa9633491 Raid blocks will now keep their inventory when broken, allowing relocation without losing their data. 2015-01-22 21:02:46 +01:00
Florian Nücke
fe4f63dc23 Fixed AE2 integration's getCraftables returning stored stacks; now properly returning recipe output stacks (mostly noticeable in the stack size of a craftable). Closes #841. 2015-01-22 16:24:36 +01:00
Florian Nücke
60c97140d9 Make disassembler finish disassembly of added item immediately if added by a player in creative mode. Closes #839. 2015-01-21 21:46:29 +01:00
Florian Nücke
49197c57b1 Fixed miniscule chance of items breaking in disassembler even when chance was set to zero (see #839). 2015-01-21 19:49:42 +01:00
Florian Nücke
5679150b80 Make block breaking fail when we're too weak (strength is zero). Fixes #834. 2015-01-20 12:56:25 +01:00
Florian Nücke
3a217d830d Test thinger for #834. 2015-01-20 00:59:51 +01:00
Florian Nücke
19e39a2f13 Extended implementation of switch CC peripheral to properly "fake" connected modems (all the remote stuffs). 
This means CC can now call methods on OC peripherals \o/
 2015-01-19 23:43:00 +01:00
Florian Nücke
d3918d39dc Let me herp you all about my derps. 2015-01-19 23:41:14 +01:00
Florian Nücke
cf8adae113 Corrected echo manpage to not assume besh. Closes #835. 2015-01-19 21:29:49 +01:00
Florian "Sangar" Nücke
35b55a118b Merge pull request #832 from mpmxyz/master-MC1.7.10 
Fixed filesystem.list returning a list with duplicate values
 2015-01-19 19:03:11 +01:00
Florian Nücke
3561827cb3 Fixed bad override leading to incorrectly interpreted redstone output in some scenarios. Closes #836. 2015-01-19 18:52:53 +01:00
Florian Nücke
25aab07368 Fixed Mekanism energy acceptor method returning inverted value, leading to non-stop power acceptance. 2015-01-18 21:59:02 +01:00
mpmxyz
6079f0e0f5 Fixed filesystem.list returning a list with duplicate values 
The error was caused by increasing the index i after removing its value: The value after the removed one was ignored.
To see an effect you need two directories being neighbors in the list.
Both also have to have a symbolic link or a mounting point inside.
-> That's a rare but possible combination.

Here an example:
 bugdir/
  a/
   link1 -> link somewhere
  b/
   link2 -> link somewhere
#ls bugdir
a  b  b (!)
 2015-01-18 18:55:56 +01:00
Florian Nücke
83fdee38f3 Added comparator override to capacitor, based on its (local!) buffer fill rate. 
Note that this updates its neighbor blocks only using block ticks, which are random (because I do not want capacitors to be ticking tile entities). So don't expect this to update *immediately*.
 2015-01-18 14:30:50 +01:00
Florian Nücke
da410fc13e Added timeout to item cost computation, just to be on the safe side. 
Had that lock up in dev mode a few times, pretty sure the synchronization should be enough, but hey.
 2015-01-18 14:28:04 +01:00
Florian Nücke
13a8dde8a6 Fixed highly unlikely, non-critical NPE in machine (could happen in the very rare case that an executor thread started while the machine was being removed from the network, leading it to run while the machine is unconnected - that's still possible, but non-critical; it'll just stop/silently error and stop now). 2015-01-18 14:27:23 +01:00
Florian Nücke
db05a22430 Completely fitched the beep. MVP gamax92 ^ 0x80. 2015-01-18 04:15:45 +01:00
Florian Nücke
cc640134f5 Rendering fixes. 2015-01-17 20:01:21 +01:00
Florian Nücke
d869ba4df9 Bumped default sample rate for generating computer speaker beeps to avoid artifacts and made it a setting. 2015-01-17 14:54:53 +01:00