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
4c567e54c3
Synchronize cache access, to be on the safe side.
2015-08-12 19:11:04 -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 "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
201da35011
Use a non-invalid default dummy item in loot generator.
2015-08-05 21:14:42 +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
7347e6fb3e
Started on making rack more modular and extendable.
2015-08-05 01:52:13 +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
bc478cde58
Disallow managed/unmanaged mode opening GUI for loot disks.
2015-08-02 21:26:13 +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
220b6cc67c
Added backwards compat in Items API for internal name changes via aliases.
2015-07-27 19:33:54 +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 "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
Florian Nücke
db280211a9
Fix overcompensating for dig time (wrong since slow breaking... oh welp).
2015-07-26 17:04:00 +02:00
Florian Nücke
391048ae99
Added isEquivalentTo
and areStacksEquivalent
to inventory controller, allowing to check if items share an oredict id. Closes #1303 .
2015-07-26 15:49:13 +02:00
Florian Nücke
b156684cc6
Added setting to configure server rack built-in switch upgrade level. Closes #1304 .
...
Defaults to T1 upgrade level because otherwise it's cheaper to build racks than upgrading switches...
2015-07-26 12:09:14 +02:00
Florian Nücke
f71a86f584
One more safe-guard against server rack leakage.
2015-07-26 12:06:49 +02:00
Florian Nücke
8e190a02e7
Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10
...
Conflicts:
src/main/resources/assets/opencomputers/doc/ru_RU/item/dataCard.md
2015-07-25 21:42:05 +02:00
Florian Nücke
5e937bbeb8
Might fix memory leak in server racks.
2015-07-25 21:39:38 +02:00
cyber01
5fe84ffe4e
Correct misspelling
...
Updated dataCard, same as other multilevel items
Changed oredict in item description
2015-07-25 18:44:46 +03:00
Florian Nücke
71c53de7b1
Requesting stack of size 1 instead of 0, because apparently AE doesn't like ghost stacks. Closes #1331 .
2015-07-25 15:04:41 +02:00
Florian Nücke
00da2ee53e
Should fix potential deadlock when machines get disposed while they're running. Closes #1322 .
2015-07-25 14:53:57 +02:00
Florian Nücke
284598d9a2
Version bump.
2015-07-25 14:11:42 +02:00
Florian Nücke
1d0a0b98ad
Added redirects for T2 and T3 data card manual pages.
2015-07-25 14:10:58 +02:00
Florian Nücke
2aa54dd199
Reworked textures for T2 and T3 data card.
2015-07-25 12:20:49 +02:00
Florian Nücke
4508cc4a80
Fixed data lib only providing methods of the card installed at the time it is initialized (libs are cached so this broke things when moving to a different tier of data card).
2015-07-25 12:03:37 +02:00
Florian Nücke
c447588442
Removed data.tier(), doesn't really fit IMHO and no other component does that (and feature checks are more robust anyway).
...
Made simple md5/sha256 on data card T2+ call super for basic variant to make sure they behave absolutely the same as T1.
Just a bit of code shuffling.
2015-07-25 12:02:42 +02:00
Florian Nücke
12a37cf83a
Make dataCard -> dataCard1 for consistence; if any addon mod used Items.get("dataCard") they'll have to adjust, but that chance is slim, I'd say...
...
Also adjusted recipes a bit, recursive upgrading fits better into the hardmode set.
2015-07-25 11:21:43 +02:00