4089 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Florian Nücke	fd96b309a5	Formatting of lua programs (two space indentation), also feature based check in gpg.lua which is more in line with other components.	2015-07-25 11:19:17 +02:00
Florian Nücke	f27e0c1d5a	Avoid potential match errors in data card driver and specific environment for different tiers.	2015-07-25 11:16:53 +02:00
Florian Nücke	d24a02f04b	Merge branch 'master-MC1.7.10' of https://github.com/makkarpov/OpenComputers into master-MC1.7.10 ... Conflicts: build.gradle	2015-07-25 11:08:40 +02:00
Florian Nücke	f89fb5bfea	Merge branch 'master-MC1.7.10' of https://github.com/Shuudoushi/OpenComputers into master-MC1.7.10	2015-07-25 11:08:03 +02:00
Florian Nücke	d510fe9fb0	Merge branch 'master-MC1.7.10' of https://github.com/CaitlynMainer/OpenComputers into master-MC1.7.10	2015-07-25 11:07:43 +02:00
Florian Nücke	074ee33f76	Merge branch 'patch-1' of https://github.com/Chlikikijleelgus/OpenComputers into master-MC1.7.10	2015-07-25 11:07:06 +02:00
Florian Nücke	77cdd50e5c	Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10	2015-07-25 11:07:02 +02:00
Caitlyn	71ecf0dacf	Wobbo is Wobbo. ... [14:56:01] <@Mimiru>Wobbo, has anyone ever gotten your In game MC name? [14:56:14] <Wobbo>Mimiru: Wobbo [15:06:37] <Wobbo> R: 25 G: 120 B: 200	2015-07-24 15:08:17 -05:00
Shuudoushi	15345a736b	Fixed spelling and grammar errors within the man pages.	2015-07-24 13:40:32 -05:00
Florian Nücke	20f6e83539	tl;dr	2015-07-24 19:02:16 +02:00
Florian Nücke	1fbde2c866	Removed unused and now dead dep on resonant engine that caused build errors.	2015-07-24 18:59:15 +02:00
Chlikikijleelgus	46130b036b	Added some new robot names	2015-07-24 05:22:18 -07:00
makkarpov	3f69cab11a	Add tiered data cards: ... - Tier 1: Basic data card operations - Tier 2: Basic operations + AES-CBC encryption/decryption - Tier 3: Basic + AES-CBC + ECDSA + ECDH - Textures are now looking like a stubs that are waiting for better alternatives - Recipes by Kubuxu - gpg.lua program (simple version without keychain) --- Change log after squash --- + Changed to ThreadLocal instance of SecureRandom instead of genSeed function + Added readable errors in case of invalid key type + Added SecureRandom instance to EC key generator to avoid unnecessary creation of another one. + Added check that data card is present and `data.present()` function + Fixed typo at 029915d595/src/main/resources/assets/opencomputers/lua/component/data/lib/data.lua (L15)	2015-07-24 13:06:18 +03:00
Florian "Sangar" Nücke	1d5542d995	Merge pull request #1317 from magik6k/master ... Update Plan9k	2015-07-21 10:04:30 +02:00
Łukasz Magiera	43057f1ee1	Update Plan9k ... Signed-off-by: Łukasz Magiera <magik6k@gmail.com>	2015-07-21 03:56:15 +02:00
Florian "Sangar" Nücke	991ef66a3a	Merge pull request #1311 from ChickenNuggers/patch-2 ... tostring( reason ) is never false/nil	2015-07-19 18:50:35 +02:00
Charles Heywood	ed0acd06e5	tostring( reason ) is never false/nil	2015-07-19 05:06:28 -05:00
Florian Nücke	cdcbcc44b8	Merge branch 'master-MC1.7.10' of https://github.com/CaitlynMainer/OpenComputers into master-MC1.7.10	2015-07-17 19:13:18 +02:00
Florian Nücke	a1b164a134	Added blacklist for recipe inputs for disassembler. Default contains fire for chainmail blacklisting. Closes #1296.	2015-07-17 19:12:56 +02:00
Florian Nücke	f26ae2d1c6	Hi.	2015-07-17 19:12:17 +02:00