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

4246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
13b89b6379 Added capability to arbitrarily rotate tier 2 holograms and set a rotation speed to auto-rotate them. Closes #1401. 2015-09-11 01:01:51 +02:00
Florian Nücke
2791308b17 Fixed the bloody time formatting once and for all. Probably. Closes #1413. 
Why did I not use the Calendar class in the first place? BECAUSE CHICKENS. Seriously, I don't even know anymore. That code was ancient.
 2015-09-10 22:32:25 +02:00
Florian Nücke
29d7746b26 Little more cleanup and homogenizing. 2015-09-10 20:51:07 +02:00
Florian Nücke
af49402d67 Likely proper implementation of IInventory.getStackInSlotOnClosing. 
Cleaned up and unified some inventory code, hopefully not breaking everything in the process...
 2015-09-10 20:50:21 +02:00
chaoskagami
27130ef44a Update to the proper final repo for NeK. Or so I hope, at least. 2015-09-07 21:58:54 -04:00
Florian Nücke
f8b9436f9c Version bump 2015-09-06 16:55:52 +02:00
Florian Nücke
dacc219984 Fixed potential dupe bug when having robots use ExU drums. 2015-09-06 16:54:29 +02:00
Florian Nücke
d92f3ca9d8 Merge branch 'nek-fix' of https://github.com/chaoskagami/OpenComputers into master-MC1.7.10 2015-09-05 23:39:52 +02:00
Florian Nücke
d90325e6d5 Bump version. 2015-09-05 23:03:23 +02:00
Florian Nücke
a0ce592382 Fixed crash when trying to change APU architecture. Closes #1404. 2015-09-05 23:00:09 +02:00
chaoskagami
38f30944f1 Fix for NeK maven being removed 2015-09-04 20:40:33 -04:00
Florian Nücke
81c2b7d1cc Avoid hover boots taking actual damage, subtract energy instead. Closes #1400. 
Also added slowness effect when running around with drained boots.
 2015-09-04 18:13:11 +02:00
Florian Nücke
0bc35468da Merge branch 'master' of https://github.com/magik6k/OpenComputers into master-MC1.7.10 2015-08-30 16:51:25 +02:00
Łukasz Magiera
3656ed941f
Fixed stderr not being passed in os.spawn in Plan9k 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-08-30 16:50:15 +02:00
Florian Nücke
7042f7f87d Merge branch 'master' of https://github.com/magik6k/OpenComputers into master-MC1.7.10 2015-08-30 16:10:51 +02:00
Łukasz Magiera
06705e3891
Update plan9k 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-08-30 15:28:49 +02:00
Florian Nücke
e23378b662 Added setting to change delay enforced when changing redstone output. 2015-08-29 16:24:43 +02:00
Florian "Sangar" Nücke
ee3d2696c9 Merge pull request #1393 from cyber01/RU_doc 
Added Transposer to Russian translation
 2015-08-29 16:05:21 +02:00
Florian Nücke
931a04c61b Taking into account ISidedInventory.getAccessibleSlotsFromSide in InventoryUtils, because some inventories are... special. 
E.g. AgriCraft's Analyzer has getInventorySize = 2, but there are no slots 0 and 1, only slots 36 and 37 (or so; anyway, something way out of the range of to be expected valid indices).
 2015-08-29 15:55:38 +02:00
Florian Nücke
83ce705a99 Finished migrating crop stuff to Geolyzer/converter logic (mostly because I cba to make new graphics >_>). 
Also added AgriCraft API as JAR lib because getting the Gradle dep to work is a royal pita and I wasted too much time on trying that already...
 2015-08-29 15:10:44 +02:00
cyber01
a6988ed1ec Added Transposer 2015-08-29 15:58:46 +04:00
Florian Nücke
f41fe495b7 Merge branch 'farming_upgrade' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Started killing off upgrade stuff in favor of moving it into the geolyzer.

Conflicts:
	build.gradle
	build.properties
	src/main/scala/li/cil/oc/common/init/Items.scala
 2015-08-29 13:46:05 +02:00
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
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
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
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
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
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