AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 11:48:02 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,892 Commits 29 Branches 143 Tags
Commit Graph

5892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian "Sangar" Nücke
655bf8d85b Merge pull request #2134 from Vexatos/enderio-1.10 
Re-added EnderIO integration and added Bundled Redstone support for EnderIO's Insulated Redstone Conduits
 2016-12-11 12:45:22 +01:00
Florian Nücke
4ffe6220ca Fixed newly placed cases having zero energy buffer capacity. 2016-12-11 12:43:02 +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
Florian Nücke
c46d6703c5 Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-12-11 11:38:02 +01:00
Florian "Sangar" Nücke
b8de81f879 Merge pull request #2135 from Vexatos/jei-update 
Updated JEI integration.
 2016-12-11 11:38:50 +01:00
Florian Nücke
988f4e5b85 Made ScoreboardValue properly persist. 2016-12-11 11:37:31 +01:00
Florian Nücke
2e440d09a0 Merge branch 'addScoreboardToDebug' of https://github.com/InfinitySamurai/OpenComputers into master-MC1.10 2016-12-11 11:21:55 +01:00
Vexatos
f48dfee32d Fix #2173. 2016-12-10 16:10:37 +01:00
Vexatos
7a0ac13e64 Allow null side in the Tesla capability. 
Closes #2164.
 2016-12-08 08:36:22 +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
a91b7b3939 Merge remote-tracking branch 'origin/master-MC1.9.4' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/util/FluidUtils.scala
 2016-11-20 00:18:57 +01:00
Vexatos
d89652961d Merge remote-tracking branch 'origin/master-MC1.8.9' into master-MC1.9.4 2016-11-20 00:18:13 +01:00
Vexatos
b7e03cae44 Added IFluidHandler capability support to tank analytics. 
For #2063.
 2016-11-19 23:41:34 +01:00
Vexatos
baff8dcca6 Fixed RedLogic redstone input reading. 2016-11-17 23:54:47 +01:00
Vexatos
79d952f1c4 Re-added EnderIO integration and added Bundled Redstone support for EnderIO's Insulated Redstone Conduits 2016-11-17 08:23:28 +01:00
Vexatos
764683df2c Updated JEI integration. 2016-11-17 08:19:01 +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
Florian Nücke
03382b733b Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-11-12 15:26:07 +01:00
Florian Nücke
d1b372ecf5 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-11-12 15:25:49 +01:00
Florian Nücke
4a47b04e56 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-11-12 15:25:31 +01: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
e85fbb4c52 Merge remote-tracking branch 'upstream/master-MC1.9.4' into master-MC1.10 2016-10-26 22:25:51 -07:00
payonel
03d6488283 Merge remote-tracking branch 'upstream/master-MC1.8.9' into master-MC1.9.4 2016-10-26 22:24:13 -07:00
payonel
3104d723b9 Merge remote-tracking branch 'upstream/master-MC1.7.10' into master-MC1.8.9 2016-10-26 22:20:50 -07:00
payonel
06e7149573 greatly simplify readnum by leveraging tonumber 2016-10-26 22:16:25 -07:00
Florian Nücke
6091584e1e Some touch-ups to merged PR. 2016-10-15 18:10:27 +02:00
Florian Nücke
b3be81c91c Merge branch 'expandingDebugPlayerObject' of https://github.com/InfinitySamurai/OpenComputers into master-MC1.10 2016-10-15 18:03:32 +02:00
Florian Nücke
bd4e6f8ddf Merge branch 'enderstorage-1.10-PR' of https://github.com/thiakil/OpenComputers into master-MC1.10 2016-10-15 17:57:02 +02:00
Florian Nücke
0f7ff5af6f Fixed floppy insert/remove sounds. 2016-10-15 17:53:22 +02:00
Florian Nücke
5486fbc0a6 Fixed slot overlay rendering. 2016-10-15 17:15:19 +02:00
Florian Nücke
c81a412046 Fixed Tesla integration crashing stuff. 
Because people lied to me.
 2016-10-15 16:45:55 +02:00
Russell Long
256cbe761a Created and added functionality to debug Scoreboard class 2016-10-04 22:04:41 +11:00
Russell Long
dbea220117 Added further functionality to the player object in the debug card 2016-10-03 15:40:05 +11:00
Thiakil
2b4c7f95b6 Update EnderStorage driver to 1.10 API 
Change setFrequency to use 3 parameters (to match EnderStorage API), single arg compatibility retained
Change getFrequency to return a table of 3 ints instead of 1 int (again, API change)
Add getFrequencyColors which does the same as getFrequency, but with strings of MC colours
Add getColors to enable lua to retrieve a mapping of colours to numbers (NB array is zero based in java, so first el is number 0 in setFrequency)
Add NamedBlock support so Ender Tanks appear in component list as ender_tank, chests as ender_chest. (previously was being overridden by CompondBlockDriver)
 2016-10-02 13:19:01 +08:00
Florian Nücke
51085de828 Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-09-19 21:21:40 +02:00
Florian Nücke
496955aa1d Update IC2 dep. 2016-09-19 21:21:18 +02:00
Florian Nücke
60c213040a Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-09-19 21:20:20 +02:00