AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-14 01:39:36 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,981 Commits 29 Branches 143 Tags
Commit Graph

3981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
cdbce01aad Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
 2015-04-23 21:39:02 +02:00
Florian Nücke
043548e78e Removed broken workaround for not progressing robot hover animation when game is paused. Closes #1101. 
Because the bug in Mystcraft the workaround was required for in the first place has been fixed. \o/
 2015-04-23 21:37:49 +02:00
Florian Nücke
83bd1bee7e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/java/li/cil/oc/api/event/RobotRenderEvent.java
 2015-04-23 18:55:23 +02:00
Florian Nücke
d52ed578b7 Add mount point name to mount point class. 
Allow template's assemble to return a `Number`, not only `Double`s.
 2015-04-23 18:54:12 +02:00
Florian Nücke
7ef18782d7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-23 10:15:46 +02:00
Florian Nücke
fef2784141 Seems like implementing a SideOnly interface makes the whole class SideOnly, instead of just stripping the interface... oh well. Closes #1098. 2015-04-23 10:15:24 +02:00
Florian Nücke
af6f781ec6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
 2015-04-22 23:28:40 +02:00
Florian Nücke
1528a6ee24 Scratch that and let's do it again. Might silence the voices in my head (aka @Vexatos). 
Changed robot upgrade rendering to allow being picky. A bit more overhead, but hey, what's a few sets among friends?
 2015-04-22 23:26:41 +02:00
Florian Nücke
a9448556a0 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
 2015-04-22 18:44:32 +02:00
Florian Nücke
fda54f2f6f All right then, have a few methods to allow influencing which mount point to render your upgrades in. 2015-04-22 18:42:50 +02:00
Florian Nücke
7a0a7e9b3e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/common/item/Delegator.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverFileSystem.scala
	src/main/scala/li/cil/oc/server/fs/FileSystem.scala
 2015-04-22 18:06:37 +02:00
Florian Nücke
9ac38ad1b2 Changed the way upgrades on robots are rendered, now using an interface on items instead of item renderer. Closes #1038. 
More flexible and should also work in MC1.8...
 2015-04-22 17:47:34 +02:00
Florian Nücke
20239780e1 Extended file system API to allow specifying a speed multiplier for file systems. 
For now, valid range is [1,6]. Floppies use 1, HDDs use 2-4, Raid is 6.
Deprecated some internal FileSystem interface methods to allow simplifying the interface a bit when the time comes.
Let's hope nobody is shipping the API \o/
 2015-04-22 15:21:43 +02:00
Florian Nücke
fa36908170 Allow using glowstone block to increase prints light level faster. 
Block increases light level by 4, dust by 1 as before.
 2015-04-22 12:58:58 +02:00
Florian Nücke
7207606960 Merge remote-tracking branch 'remotes/origin/updated_recipes' into master-MC1.7.10 2015-04-22 12:53:09 +02:00
Florian Nücke
1722c619c5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-22 11:38:28 +02:00
Florian Nücke
57714dad27 Fixed ls -l in pure io mode. 2015-04-22 11:38:09 +02:00
Florian Nücke
4f70ea4152 Bump version number. 2015-04-22 11:22:33 +02:00
Florian Nücke
76172d0dfb Made env variables local (i.e. os.getenv/setenv will operate per process now), to avoid programs running in parallel (via piping) to interfere. 
Copying env vars from last process to shell's env to avoid breaking compat. (cd.lua will still work that way, e.g.)
Closes #634.
 2015-04-22 11:22:14 +02:00
Florian Nücke
6377a5824f sh.lua absorbed besh.lua's piping mechanics. RIP besh. 2015-04-22 10:43:34 +02:00
Florian Nücke
52310fa23e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-21 14:04:06 +02:00
Florian Nücke
33bf52ae94 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-04-21 14:03:49 +02:00
Florian Nücke
6a811b6471 Fix oc_at.cfg in obf environment. 2015-04-21 14:03:15 +02:00
Florian Nücke
73f730be79 Manual init of server rack GUI for #1085. 2015-04-21 13:38:05 +02:00
Florian Nücke
35d239d7a2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-21 13:32:34 +02:00
Florian "Sangar" Nücke
0b000b75bf Merge pull request #1095 from mpmxyz/patch-2 
Fix: standard io streams being closable
 2015-04-21 13:31:52 +02:00
Florian Nücke
323f823506 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Sound.scala
	src/main/scala/li/cil/oc/server/component/UpgradePiston.scala
 2015-04-21 13:16:30 +02:00
Florian Nücke
886ebaae5e Fixed rebooting computers via Java API not working (i.e. calling stop() and start() in succession). 
This also fixes LuaJ computers not rebooting when loaded again.
 2015-04-21 12:32:35 +02:00
Florian Nücke
ce552ff99d Should avoid unexpected error if trying to tostring a method that's now filtered out. 
Clearing out callback cache when a world is unloaded.
 2015-04-21 12:02:02 +02:00
Florian Nücke
8a31eba5c3 Removed use of a few remaining reflection thingers, since we have an oc_at.cfg now anyway. 2015-04-21 11:36:23 +02:00
mpmxyz
690d664003 Fix: standard io streams being closable 
To be exact: Not the streams themselves but the buffers on top of them can be closed.
I noticed that because "ls" didn't display anything after some experiments involving an "stdout" file.
 2015-04-20 19:03:35 +02:00
Florian Nücke
a8389f7056 Documented GT recipe handlers in recipe set. 
Renamed a few things, simplified a few things, scalafied a few things.
 2015-04-20 12:44:34 +02:00
Florian "Sangar" Nücke
61ff63257b Merge pull request #1093 from natedogith1/master-MC1.7.10 
Fixed use of setRawDelay config option
 2015-04-20 10:34:16 +02:00
natedogith1
64dce8c4ba Fixed use of setRawDelay config option 2015-04-19 20:30:09 -04:00
Johannes Lohrer
b78c446c22 Merge branch 'updated_recipes' of github.com:MightyPirates/OpenComputers into updated_recipes 
Conflicts:
	src/main/scala/li/cil/oc/integration/gregtech/RecipeRegistry.scala
 2015-04-19 20:53:13 +02:00
Johannes Lohrer
7a248833b7 made additional outputs a sequence to allow additional machines 
so these commits should basically close #760
 2015-04-19 20:52:12 +02:00
Johannes Lohrer
f534e1b3b6 made additional outputs a sequence to allow additional machines 
so these commits should basically close #760
 2015-04-19 20:50:13 +02:00
Florian Nücke
d0062067d1 Should fix #1085 for good... probably. 2015-04-19 17:48:39 +02:00
Florian Nücke
0cf6e53d05 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-19 16:44:19 +02:00
Florian Nücke
05e4c07907 Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 2015-04-19 16:43:37 +02:00
Florian Nücke
40bf4a31a3 Improved handling of tracking of changes to holograms to reduce bandwidth in certain cases some more. 
Slightly more bookkeeping, but that's relatively cheap.
 2015-04-19 16:42:55 +02:00
cyber01
346daf9e96 Fix #1086 in russian manual 2015-04-19 17:33:07 +03:00
Florian Nücke
061f6f9156 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/entity/Drone.scala
 2015-04-19 14:58:38 +02:00
Florian Nücke
2cf672807a Fixed a few issues with drones moving through portals. 
For one, they won't also drop themselves as items anymore.
For two, they won't shut down after moving through the portal anymore.
Also corrected the target position relocation.
 2015-04-19 14:55:47 +02:00
Florian Nücke
7b10fd9f63 Added null check to server rack GUI that should fix #1085. 
If this does work, it means the GUI is rendered before it's initialized, which would be... problematic.
If it doesn't it means the GUI was created in a way that should be impossible.
 2015-04-19 13:16:11 +02:00
Florian Nücke
2f7b22fc0b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-19 13:12:21 +02:00
Florian Nücke
78ddda0426 Homogenized indentation in config. 2015-04-19 13:07:06 +02:00
Florian Nücke
30d722e19d Limit speed of hologram.setRaw a bit, to lower worst-case bandwidth use, but made it configurable. 
Also moved hologram server-side settings to extra category in config.
 2015-04-19 13:05:33 +02:00
Florian Nücke
7fc4d67dee Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 2015-04-19 11:32:34 +02:00
Florian Nücke
dd975cc034 Merge branch 'patch-1' of https://github.com/CaitlynMainer/OpenComputers into master-MC1.7.10 2015-04-19 11:32:07 +02:00