AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-10-03 10:05:35 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,096 Commits 29 Branches 143 Tags
Commit Graph

5096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
56815c9985 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 
Conflicts:
	build.properties
 2015-08-05 22:11:22 +02:00
Florian Nücke
5eda6c2920 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.7.10 
Conflicts:
	build.properties
v1.5.15 		2015-08-05 22:08:49 +02: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
7347e6fb3e Started on making rack more modular and extendable. 2015-08-05 01:52:13 +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
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
3a5b8047e8 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-07-26 12:40:07 +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
95edcba365 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-07-25 21:42:51 +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