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

4681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vexatos
0c64dd30fd Added device info to MFU. 2017-02-03 23:03:42 +01:00
Vexatos
f00b828332 Merge branch 'master-MC1.7.10' into mfu 2017-02-03 21:46:27 +01:00
Vexatos
9332bc70cd Properly send the cycling disk list to the client. 2017-01-28 13:59:53 +01:00
Vexatos
02add30920 Merge pull request #2209 from Vexatos/addon-disk-cycling 
Allow addons to register their floppies for loot disk cycling.
 2017-01-27 18:48:41 +01:00
Vexatos
ce304ea248 Allow nil to be passed to optional type-specific arguments, making them return their default value. 
For #2232.
 2017-01-22 15:12:38 +01:00
Vexatos
5c76be7fc5 Just making sure on the paths on OPPM installation. 2017-01-12 20:14:04 +01:00
Vexatos
790f5976b9 Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.7.10 2017-01-12 20:12:03 +01:00
Vexatos
fa3fff4148 Update OPPM floppy to use new install features. 
Also updated OPPM.
 2017-01-12 20:11:46 +01:00
Vexatos
dcdf8346f3 Merge pull request #2210 from magik6k/master-MC1.7.10 
Update Plan9k(Fixed PR)
 2016-12-30 16:19:58 +01:00
Łukasz Magiera
742c8eecb6 Fixed plan9k 2016-12-30 16:16:04 +01:00
Łukasz Magiera
337ecbb1f2 Update Plan9k 2016-12-30 16:15:53 +01:00
Vexatos
42519e8af3 Allow addons to register their floppies for loot disk cycling. 2016-12-30 12:49:40 +01:00
Vexatos
16fc8a9113 May fix #2192. 2016-12-29 18:37:36 +01:00
Florian Nücke
94efa8d17e Don't close all sides for adapters placed before the last update. I hope you didn't update if you used adapters to control anything... sensitive. You didn't, right? Right?! 2016-12-17 23:48:11 +01:00
Florian Nücke
008f55f6bb Version bump. 2016-12-17 22:28:16 +01:00
Florian "Sangar" Nücke
9441679dbb Merge pull request #2113 from MoonlightOwl/patch-1 
Update ru_RU.lang
 2016-12-17 21:48:46 +01:00
Florian Nücke
3548062e82 Merge branch 'multi-environment-providers' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2016-12-17 21:37:02 +01:00
Florian Nücke
00132337de Added overlay for adapter to indicate open sides. Using same graphic for all adapter sides. Fixed match error when side is closed, homogenized removal logic. 2016-12-17 20:35:18 +01:00
Florian Nücke
15f7524837 Merge branch 'adapter-sides' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2016-12-17 19:58:40 +01:00
Florian Nücke
cca50d7c7a Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-12-17 14:53:14 +01:00
Florian Nücke
0148ccff26 Make Machine.signal less picky about the types of maps it accepts. 2016-12-17 14:49:05 +01:00
Florian "Sangar" Nücke
ffc65616c0 Merge pull request #2180 from Vexatos/fuzzy-compare 
Added metadata-ignoring fuzzy option to robot.compare.
 2016-12-17 14:23:19 +01:00
payonel
648a289c4a Merge pull request #2183 from gamax92/fix-time-formatter 
Fix time formatter bugs
 2016-12-12 14:28:12 -08:00
gamax92
16d272303c Fix broken c and e time formatting flags 
%c should be using %e not %d
%e does not need a space
 2016-12-12 14:58:59 -07:00
gamax92
f8315269f6 Fix os.time and os.date affected by host timezone 
The UTC timezone has an offset of 0 and does not experience daylights saving time.
 2016-12-12 14:48:49 -07:00
Florian "Sangar" Nücke
a131029fd1 Merge pull request #2181 from Vexatos/fix-item-inventory-control 
Fixed methods ItemInventoryControl not doing what they are supposed to do.
 2016-12-11 20:06:55 +01:00
Vexatos
75356d1f04 Fixed methods ItemInventoryControl not doing what they are supposed to do. 2016-12-11 20:04:06 +01:00
Vexatos
db0a67eca5 Added metadata-ignoring fuzzy option to robot.compare. 2016-12-11 13:15:36 +01:00
Florian "Sangar" Nücke
6e1270ef08 Merge pull request #2174 from Vexatos/no-crash-in-NBT 
Fix robots duplicating with SpongeForge.
 2016-12-11 11:58:31 +01:00
Vexatos
4b70a026d2 Allow multiple environment providers to return environments for the same ItemStack. 2016-12-11 11:53:29 +01:00
Vexatos
f48dfee32d Fix #2173. 2016-12-10 16:10:37 +01:00
payonel
21be185fe9 Merge pull request #2149 from gamax92/fix-luaj-kernel-name 
Fix kernel naming in LuaJ
 2016-11-29 21:04:31 -08:00
gamax92
60512f71d5 Fix kernel naming in LuaJ 
LuaC has "=machine" but LuaJ has "=kernel"
 2016-11-29 15:36:58 -07:00
payonel
6b662a4f79 Merge pull request #2139 from Vexatos/redlogic-fix 
Fixed RedLogic redstone input reading.
 2016-11-20 22:14:16 -08:00
payonel
f2bbc4b288 Merge pull request #2131 from gamax92/uuid-verify 
Fix Arbitrary Read/Write exploit
 2016-11-20 21:41:31 -08:00
Vexatos
baff8dcca6 Fixed RedLogic redstone input reading. 2016-11-17 23:54:47 +01:00
gamax92
d0f4a676ec Validate NBT address of FileSystems 
Validate the address stored in hard disks and floppy disks and generate a new address if it is now longer a UUID.
Fixes breaking out of the sandbox and accessing host files with potential writes.

This does not fix being able to modify drives using a debug card or creative mode to access other drives.
 2016-11-14 09:20:01 -07:00
payonel
1d5c69924f Merge pull request #2118 from payonel/openloader-installer 
make openloader installer compatable with openos install tool
 2016-11-02 21:42:45 -07:00
payonel
c80943c9ce make openloader installer compatable with openos install tool 2016-11-02 21:30:35 -07:00
payonel
dd10cd7ecc Merge pull request #2109 from payonel/cleanup-program-locations 
wget and pastebin are now core to openos install
 2016-11-01 23:02:04 -07:00
payonel
83129f21ac check args 2016-11-01 23:00:24 -07:00
payonel
e5d2b0051f simple error reporting and message to craft install disk if user tries to use program known to computer.getProgramLocations() 2016-11-01 22:26:27 -07:00
payonel
c875381d40 wget and pastebin are now core to openos install 2016-11-01 22:26:26 -07:00
payonel
0d9c938411 Merge pull request #2108 from payonel/io-readnum-no-asterisk 
Io readnum no asterisk
 2016-11-01 22:25:19 -07:00
Zhidenkov Dmitry
62e837cab0 Update ru_RU.lang 2016-10-28 23:22:06 +03:00
payonel
280bebb4dc grammar corrections 2016-10-28 10:03:46 -07:00
payonel
e5c18fea6b lua 5.3 allows no * prefix in io.read 2016-10-26 22:37:19 -07:00
payonel
06e7149573 greatly simplify readnum by leveraging tonumber 2016-10-26 22:16:25 -07:00
Florian Nücke
4dccd26b04 Don't consume XP items when upgrade is at max level. Closes #2035. 2016-09-19 19:59:57 +02:00
Florian Nücke
feb886b9f7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-09-18 20:30:30 +02:00