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

4587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
84d912cef8 Added term.reset(). Closes #1377. 2015-08-29 12:31:19 +02:00
Florian Nücke
0387264743 Updated PSD with transposer textures. 2015-08-29 12:19:49 +02:00
Florian Nücke
f11faeeea5 Slight change to returned values from transposer.transferFluid (unified with erroneous case). 
Some throttling to fluid movement speed.
 2015-08-29 12:10:53 +02:00
Florian Nücke
01c92dee28 Ignoring calls to change wireless frequency / value if nothing changes, avoid resetting state. Closes #1363. 2015-08-29 12:08:32 +02:00
Florian Nücke
362b62341b Added option to enable 'fuzzy' wake on LAN (ignoring additional arguments instead of requiring an exact match). Closes #1368. 2015-08-29 12:07:45 +02:00
Florian Nücke
3f353dbadf Adjustments for 1.8. 2015-08-29 03:55:10 +02:00
Florian Nücke
4f5cbf9bad Missed that earlier... 2015-08-29 02:43:11 +02:00
Florian Nücke
0a9e950869 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/PacketHandler.scala
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/common/block/Geolyzer.scala
	src/main/scala/li/cil/oc/common/block/NetSplitter.scala
	src/main/scala/li/cil/oc/common/init/Blocks.scala
	src/main/scala/li/cil/oc/server/PacketSender.scala
	src/main/scala/li/cil/oc/server/component/traits/TankWorldControl.scala
	src/main/scala/li/cil/oc/util/ExtendedArguments.scala
 2015-08-29 02:42:54 +02:00
Florian Nücke
fb816b9da7 Added transposer block for moving items and fluids between adjacent blocks. Closes #1244. 
Also refactored fluid stuffs quite a bit; may lead to slight changes in behavior here and there (e.g. returning empty table for tank info instead of "no tank" errors).
 2015-08-29 02:27:22 +02:00
Florian Nücke
a66bd22cd9 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-08-25 22:41:34 +02:00
Florian Nücke
9ab9861ef4 Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 2015-08-25 22:39:16 +02:00
Florian Nücke
32539b92e2 Merge branch 'patch-1' of https://github.com/MyNameIsKodos/OpenComputers into master-MC1.7.10 2015-08-25 22:38:35 +02:00
Florian Nücke
4e66556892 Added getter and setter for CPU architecture in computer API, closes #1390. 
Also potentially fixes a possible deadlock... maybe. Or breaks even more \o/
 2015-08-25 22:37:57 +02:00
cyber01
fdf5e33410 Added Relay 
Correction

Correction2
 2015-08-24 15:03:29 +04:00
Kodos Atoz
f0f31f9fa9 Update greetings.txt 
Updated 'Switches' to Relays, fixed a misspelling.
 2015-08-23 16:28:06 -05:00
Florian Nücke
abc1bc32b5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-08-23 22:06:03 +02:00
Florian Nücke
4644bf8541 Change component name of relay to relay; never act as repeater for tunnel messages. 2015-08-23 22:05:48 +02:00
Florian Nücke
f4491f5fc6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/common/init/Blocks.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
 2015-08-23 22:02:17 +02:00
Florian Nücke
daafa6ea2b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-08-23 21:43:48 +02:00
Florian Nücke
54b7019a11 Added relay block to replace switch and access point; has slot for wlan card or linked card to upgrade accordingly. Closes #1334. 2015-08-23 21:43:30 +02:00
Florian "Sangar" Nücke
930a38fedc Merge pull request #1370 from Kubuxu/patch-1 
Change usage of gitref in versioning.
 2015-08-14 06:53:26 -07:00
Jakub Sztandera
0285d4bfda Change usage of gitref in versioning 
As git ref hash can't be used to order versions it should be only used to denote differences between them.
By using plus sign instead of hyphen many version compression scripts and similar will stop confusing custom build versions.
It is also then compatible with SemVer version 2 ordering rules as for point 10 and 11.
It also was moved at the end so it is more obvious that it a metadata.
http://semver.org
 2015-08-14 14:36:18 +02:00
Florian Nücke
f517daa2cd Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/util/RotationHelper.scala
 2015-08-12 19:11:38 -07:00
Florian Nücke
4c567e54c3 Synchronize cache access, to be on the safe side. 2015-08-12 19:11:04 -07:00
Florian Nücke
929d9f58fe Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/server/component/UpgradePiston.scala
	src/main/scala/li/cil/oc/util/ExtendedArguments.scala
 2015-08-12 19:06:28 -07:00
Florian Nücke
8e914587e8 Added Better Records integration (item stack converters for records, multi-records and frequency crystals). Closes #1364. 2015-08-12 18:46:37 -07:00
Florian Nücke
638cc08026 Added special cases for piston upgrade to make them work for all directions in drones, and also work down for tablets. 
Moved rotation translation logic and caches to RotationHelper (should even save some memory due to central caching).
 2015-08-12 18:08:31 -07:00
Florian Nücke
e99e973228 Version bump. 2015-08-12 15:07:30 -07:00
Florian Nücke
6037f7a651 Allow passing side to piston upgrade's push() function. 
Down won't work in tablets held by players because they're holding it too high, but I honestly don't care.
Refactored and extended ExtendedArguments a bit to be more in line with normal Arguments' methods.
 2015-08-12 15:07:04 -07:00
Florian Nücke
8e3eccdbed Add small delay when rebinding while keeping screen contents to discourage driving multiple screens with frequent changes using one GPU. 2015-08-12 14:49:41 -07:00
Maxim Karpov
752af734ad Add parameter to disable resolution reset 
... because sometimes it isnt necessary and causes noticeable flickering
 2015-08-09 16:34:52 +03:00
Florian "Sangar" Nücke
ec04deeb67 Merge pull request #1354 from XeonSquared/patch-1 
Clarify EEPROM config documentation.
 2015-08-06 21:25:07 +02:00
Izaya
07dbc24080 Change some config option names. 
Should fix #1353, just provides some clairity for the difference.
 2015-08-06 21:25:42 +10:00
Florian Nücke
014bfcfd19 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-08-05 22:00:28 +02:00
Florian "Sangar" Nücke
6296348d1d Merge pull request #1351 from vifino/master-MC1.7.10 
German translation update
 2015-08-05 21:59:16 +02:00
Adrian Pistol
aa5784ec6b Translated new language file entries for the german translation. 2015-08-05 21:49:51 +02:00
Florian Nücke
b659fe7eec Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/Loot.scala
 2015-08-05 21:23:19 +02:00
Florian Nücke
201da35011 Use a non-invalid default dummy item in loot generator. 2015-08-05 21:14:42 +02:00
Florian Nücke
22b7ebb849 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-08-05 01:54:21 +02:00
Florian Nücke
fd6f06bae4 Fixed potential crash when machines stopped unexpectedly. Closes #1348. 2015-08-05 01:53:31 +02:00
Florian Nücke
e6f4fbfe19 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-08-04 22:35:36 +02:00
Florian "Sangar" Nücke
ac3c09f2d1 Merge pull request #1347 from makkarpov/patch-1 
Russian translation for unmanaged/managed modes.
 2015-08-04 22:29:18 +02:00
Florian Nücke
0730233d8b Fixed computer.stopped message. Closes #1346. 
(Which was broken since the scheduled close thinger added to avoid memory leaks... gg me.)
 2015-08-04 22:16:04 +02:00
Maxim Karpov
dac3729a3b Translate unmanaged/managed modes 2015-08-02 23:23:10 +03:00
Florian Nücke
b7dfff09f5 Le typo. 2015-08-02 21:32:46 +02:00
Florian Nücke
e49adfb63c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-08-02 21:27:18 +02:00
Florian Nücke
bc478cde58 Disallow managed/unmanaged mode opening GUI for loot disks. 2015-08-02 21:26:13 +02:00
Florian Nücke
3d663fee35 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/client/gui/Assembler.scala
	src/main/scala/li/cil/oc/client/gui/Database.scala
	src/main/scala/li/cil/oc/client/gui/Manual.scala
	src/main/scala/li/cil/oc/client/gui/Server.scala
	src/main/scala/li/cil/oc/client/gui/ServerRack.scala
	src/main/scala/li/cil/oc/common/item/FloppyDisk.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverFileSystem.scala
	src/main/scala/li/cil/oc/server/machine/Machine.scala
 2015-08-02 21:22:46 +02:00
Florian Nücke
6466bbbf8b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-08-02 21:16:46 +02:00
Florian Nücke
4be141a903 Properly handle arbitrary number types in signals and return values. Closes #1345. 2015-08-02 21:16:30 +02:00