AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 19:25:20 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,816 Commits 29 Branches 143 Tags
Commit Graph

5816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Nücke
75bc9d36f7 Whyever that was there... should fix #2046. 2016-09-19 21:20:01 +02:00
Florian Nücke
e32d82a22d Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-09-19 20:04:40 +02:00
Florian Nücke
c82336dcfe Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/client/renderer/entity/ModelQuadcopter.scala
 2016-09-19 20:04:25 +02:00
Florian Nücke
f50d1628ce Forgot to backport drone lighting fix, closes #2036. 2016-09-19 20:03:02 +02:00
Florian Nücke
ff9a01c1ff Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-09-19 20:00:32 +02: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
3ca9ad970f Should fix #2031. 2016-09-19 19:53:21 +02:00
Florian Nücke
5cab00af2d Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-09-18 20:59:55 +02:00
Florian Nücke
33502ee457 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/common/entity/Drone.scala
#	src/main/scala/li/cil/oc/common/item/data/DebugCardData.scala
#	src/main/scala/li/cil/oc/server/component/DebugCard.scala
#	src/main/scala/li/cil/oc/server/component/UpgradeSign.scala
 2016-09-18 20:59:16 +02:00
Florian Nücke
eb3babad5b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/Settings.scala
#	src/main/scala/li/cil/oc/common/item/DebugCard.scala
#	src/main/scala/li/cil/oc/server/component/DebugCard.scala
#	src/main/scala/li/cil/oc/server/component/UpgradeSign.scala
 2016-09-18 20:47:06 +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
Florian Nücke
8309e529da Merge branch 'master-MC1.7.10' of https://github.com/makkarpov/OpenComputers into master-MC1.7.10 2016-09-18 20:19:39 +02:00
Florian "Sangar" Nücke
e36d8ec425 Merge pull request #1994 from makkarpov/sign-upgrades 
Added SignChangeEvent to sign upgrade
 2016-09-18 20:18:27 +02:00
Florian "Sangar" Nücke
ee620aeacd Merge pull request #2010 from Fingercomp/bit32-rotate-fix 
Fix bit32.lrotate and bit32.rrotate
 2016-09-18 20:17:28 +02:00
Florian "Sangar" Nücke
fc56f31116 Merge pull request #2060 from joserobjr/patch-1 
Check if the world is remote before killing the drone
 2016-09-18 20:16:45 +02:00
Florian "Sangar" Nücke
d7d57f522d Merge pull request #2028 from mcshlain/master-MC1.10 
Updated forestry driver to forestry version 5.2(beta)
 2016-09-18 20:16:13 +02:00
Florian Nücke
7bcaeacb00 Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-09-18 20:11:14 +02:00
Florian Nücke
ce0f42f492 Port. 2016-09-18 20:10:46 +02:00
Florian Nücke
aaba4bbd1f Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-09-18 20:09:31 +02:00
Florian Nücke
c9060930dd Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/Rack.scala
#	src/main/scala/li/cil/oc/util/FluidUtils.scala
 2016-09-18 20:07:18 +02:00
Florian Nücke
e1ad0f6663 Avoid NPE that I don't know how it comes to be. Closes #2024. 
Lazy fix, because I'm lazy.
 2016-09-18 19:52:01 +02:00
Florian Nücke
c2a79a19eb Power mountables without requiring them to be connected to the outside. Closes #2020. 2016-09-18 19:39:35 +02:00
Florian Nücke
7d6da949de Fix NPE when other mods request tooltips before font renderer is available. Closes #2016. 2016-09-18 18:47:50 +02:00
Florian Nücke
f702949d48 Allow draining dynamic liquid blocks if they're "full" and work around the fluid registry not knowing dynamic liquid blocks... fixes ##2015. Should also fix #2023. 2016-09-18 18:42:28 +02:00
Florian Nücke
db721940ff Hmm. 2016-09-18 17:59:25 +02:00
Florian Nücke
3ca9998187 Should fix #2014. 2016-09-18 17:59:13 +02:00