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

4671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Nücke
a05c83e5e5 Added unmanaged mode for hard drives and floppies. 
Refactored GUIs a bit.
 2015-08-02 21:11:13 +02:00
Florian "Sangar" Nücke
455ef56fe4 Merge pull request #1344 from aarondandy/patch-1 
Remove outdated lua 5.3 warning in app config file.
 2015-08-02 12:08:07 +02:00
Aaron Dandy
a30dc39775 Remove outdated lua 5.3 warning in app config file 2015-08-01 18:54:23 -07:00
Florian Nücke
e92eb68711 Should fix potential race conditions between ServerThread and ClientShutdownThread, which both fire WorldEvent.Unload on the same world at the same time. 2015-07-28 22:12:58 +02:00
Florian Nücke
f7386842d8 Barely tested bit32 implementation in Lua 5.3 for backwards compat. 2015-07-28 22:01:00 +02:00
Florian Nücke
23ab8d5e16 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/init/Items.scala
 2015-07-27 19:34:59 +02:00
Florian Nücke
220b6cc67c Added backwards compat in Items API for internal name changes via aliases. 2015-07-27 19:33:54 +02:00
Florian Nücke
ab444987d8 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/server/component/DebugCard.scala
	src/main/scala/li/cil/oc/util/ExtendedNBT.scala
 2015-07-26 22:08:04 +02:00
Florian Nücke
0509c804d8 Moved nbt->map->nbt stuff to NBT helper class and made it a tad more generic. 
Also marking TEs dirty after loading and triggering a world update.
Also scala-ified the whole stuff some more.
 2015-07-26 22:04:24 +02:00
Florian Nücke
eef8d78d5d Merge branch 'master-MC1.7.10' of https://github.com/gamax92/OpenComputers into master-MC1.7.10 2015-07-26 18:04:15 +02:00
gamax92
ac3b928a2f Add NBT editing functionality to Debug Card 2015-07-26 09:41:44 -06:00
Florian Nücke
1fa191fbb1 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-07-26 17:30:24 +02:00
Florian Nücke
7e11e441f8 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
	src/main/scala/li/cil/oc/server/component/traits/WorldInventoryAnalytics.scala
 2015-07-26 17:30:11 +02:00
Florian "Sangar" Nücke
e56e1d3f22 Merge pull request #1336 from makkarpov/makkarpov-travis 
Enable Travis caching feature
 2015-07-26 17:18:10 +02:00
Maxim Karpov
4b0f96c68e Enable Travis caching feature 2015-07-26 18:16:05 +03:00
Florian Nücke
77437f2464 Make robot move animation a tad slower to make movement look smoother. Closes #1313. 2015-07-26 17:04:49 +02:00