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

2030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
1eae552aeb Added setting for hologram render distance. 
Added some settings for easier debugging.
Minor refactoring.
 2014-06-05 23:14:53 +02:00
Florian Nücke
fdf0f8f2bc Import cleanup. 2014-06-04 22:53:10 +02:00
Florian Nücke
835c859e59 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/api/java/stargatetech2/api/shields/ShieldPermissions.java
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/item/Delegator.scala
 2014-06-04 22:48:25 +02:00
Florian Nücke
55b5041149 The copy-paste strikes again. 2014-06-04 22:42:54 +02:00
Florian Nücke
254f48c208 Fixed abstract bus card recipe. 
Fixed array converter.
 2014-06-04 22:25:28 +02:00
Florian Nücke
0e6963d3d9 Added scan method for abstract bus. 2014-06-04 20:46:50 +02:00
Florian Nücke
d55343116a Updated SGT2 API. 2014-06-04 20:28:15 +02:00
Florian Nücke
f123a41d2d Added screen.getKeyboards() to allow listing keyboards attached to a screen. 
Generating new random key for special persistence whenever a computer is started, making it pretty much impossible for users to inject custom code into the persistence logic.
Fixed font texture.
 2014-06-04 20:09:02 +02:00
Florian Nücke
dca93b0627 Got rid of the 'magic pixel' in the font texture. 2014-06-04 19:05:59 +02:00
Florian Nücke
9b15478e14 Made HTTP requests not use userdata, instead the handle it returns can now be used the same way as sockets (except it can't be written to). 
Disabled userdata for the time being, looks like it will need some major time investment to track down that crash...
Removed active GC before resuming states, since that could cause execution of user code (__gc metamethod), and sandboxed __gc metamethod some more.
 2014-06-04 18:55:41 +02:00
Florian Nücke
cb5a83ebbe Fixed pure userdata being left on the stack during synchronized calls, potentially leading to unpersistable states. 2014-06-04 14:55:20 +02:00
Florian Nücke
cb69a4b386 Fixed blacklist not working when empty (because, exists is true if the list is empty...) 2014-06-04 12:58:26 +02:00
Florian Nücke
8769b11d23 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-03 22:21:55 +02:00
Florian Nücke
4931f8e84a Fixed access to client-only method in screen click logic. 2014-06-03 22:21:10 +02:00
Florian Nücke
3910487447 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-03 20:58:34 +02:00
Florian Nücke
8642a4a559 Another go at fixing that native crash, better luck this time? 2014-06-03 20:58:10 +02:00
Florian Nücke
e090883d8f Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
 2014-06-03 17:38:02 +02:00
Florian Nücke
7cc239ebe3 Fixed LuaJ fallback. 
Fixed boot address not being saved.
 2014-06-03 17:36:21 +02:00
Florian Nücke
9991f4a5fc Should fix crash in native lib by avoiding the crashing JNLua metacall. 
Rendering floppy labels on the floppy in the inventory.
 2014-06-03 16:58:11 +02:00
Florian Nücke
cd2d9b0e91 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-02 17:56:53 +02:00
Florian Nücke
d99bc5815c Forcing updates on light emitting blocks occasionally (every 2 seconds) to properly update lighting because MC's lighting needs to see a doctor. 2014-06-02 17:56:34 +02:00
Florian Nücke
1aa4eea798 Merge pull request #282 from Kodos-Atoz/patch-1 
Update robot.names
 2014-06-02 17:53:13 +02:00
Kodos Atoz
350f0f9c85 Update robot.names 
Added Crypto.  And Kodos, because hey why not.
 2014-06-02 10:48:26 -05:00
Florian Nücke
ee74576f92 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-02 14:11:55 +02:00
Florian Nücke
09cabc902d Added simple schematic builder program. 2014-06-02 14:10:46 +02:00
Florian Nücke
2c029747b0 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-02 13:25:45 +02:00
Florian Nücke
3546e4a846 Fixed items being placeable in disabled container slots in robot inventory. 2014-06-02 13:25:25 +02:00
Florian Nücke
00ad80382d Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-02 13:17:31 +02:00
Florian Nücke
faa314f790 Fixed AIOOB in robot inventory size computation. 2014-06-02 13:17:07 +02:00
Florian Nücke
b184c026dc Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-02 00:30:53 +02:00
Florian Nücke
07755515de Added support for recursive conversion (i.e. converters can push values that need to be converted again, such as item stacks) and support for pushing cyclic maps / lists. Closes #278. 2014-06-02 00:24:48 +02:00
Florian Nücke
b1291d2607 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-01 20:51:16 +02:00
Florian Nücke
6f3f9cc260 Fixes small creatures (e.g. chickens) taking damage standing on hologram projectors. Because the size was evil. Or something. I don't even. #lolwatminecraft 2014-06-01 20:50:53 +02:00
Florian Nücke
1743968924 Fixed Waila support for screens. 2014-06-01 20:30:20 +02:00
Florian Nücke
614ec30c4d Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala
	src/main/scala/li/cil/oc/client/gui/TextBuffer.scala
 2014-06-01 20:08:35 +02:00
Florian Nücke
83debc3288 Added warning icon when trying to type on a screen without a keyboard (mostly for robots). 2014-06-01 19:27:13 +02:00
Florian Nücke
403f1ffbd2 Showing reduced (screen-less) GUI for robots without screens built into them. 2014-06-01 18:20:11 +02:00
Florian Nücke
f9e1f6f1f5 Requiring a CPU and RAM in robot before allowing it to be assembled. 2014-06-01 17:32:07 +02:00
Florian Nücke
fed7f32ad7 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-05-31 16:46:29 +02:00
Florian Nücke
b3991c25ba Fixed http request persistence. 
Fixed repeated userdata persistence.
Fixed internet.request not blocking when no data was available.
 2014-05-31 16:46:04 +02:00
Florian Nücke
b4ac081000 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-05-31 02:54:18 +02:00
Florian Nücke
6174673447 Fixed items being replaced when used not being handled properly in robots (e.g. buckets), closes #279. 2014-05-31 02:51:40 +02:00
Florian Nücke
9fcd8abaaa Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-05-31 02:02:15 +02:00
Florian Nücke
4c39ee547c Fixed screen resolution changes not being applied to the GUI without re-opening it. 2014-05-31 01:45:33 +02:00
Florian Nücke
006a99414a Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
 2014-05-31 01:28:05 +02:00
Florian Nücke
22d020004c Bind GPU to screen in kernel, to allow boot errors to show up on the screen before an OS binds it. 
Set resolution and depth to max in GPU's crash display (bluescreen).
 2014-05-31 01:02:42 +02:00
Florian Nücke
6ef0e5d26c Fixed case tier not being set when assembling robots (leading to always getting a tier 1 case when disassembling). 2014-05-31 00:38:48 +02:00
Florian Nücke
46394bcef1 Fixed breaking / unloading robots crashing on servers. 2014-05-31 00:29:39 +02:00
Florian Nücke
4e988a583c Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComputers into MC1.7 2014-05-30 17:03:01 +02:00
Florian Nücke
1c115d9139 Some more fixes. 2014-05-30 17:00:22 +02:00