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

3810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
a5711aba3b Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/util/mods/Mods.scala
 2014-07-29 14:50:53 +02:00
Florian Nücke
e05c66e098 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-29 14:50:21 +02:00
Florian Nücke
7998bc87aa Added additional check which may or may not fix #442. 2014-07-29 14:49:53 +02:00
Florian Nücke
080b400901 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-29 14:25:16 +02:00
Florian Nücke
6d014b2257 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-29 14:25:00 +02:00
Florian Nücke
7ff9f0431c Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-29 14:24:24 +02:00
Florian Nücke
e9b49e292f Improved raytracing used for robot placement/interaction checks some and added range limit (so stuff like buckets can only be used in adjacent blocks, e.g.) 2014-07-29 14:23:18 +02:00
Florian Nücke
c5e964aecc Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-29 13:39:34 +02:00
Florian Nücke
9fc81d2fc9 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-29 13:38:56 +02:00
Florian Nücke
dd89ad8142 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-29 13:38:44 +02:00
Florian Nücke
3e62c0e0ae Fixes components in robots not being properly disconnect before the dropped item is generated, closes #441. 2014-07-29 13:37:49 +02:00
Florian Nücke
e9f9eb798a Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.properties
 2014-07-28 19:32:40 +02:00
Florian Nücke
343c0c09a0 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-28 19:30:50 +02:00
Florian Nücke
a4dc7c9ba5 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-28 19:24:39 +02:00
Florian Nücke
510bc85acb Should fix chunk loader not working in some cases. Closes #440. 2014-07-28 19:24:09 +02:00
Florian Nücke
0aa05ea6df Cleaned up and added .gitignore. 2014-07-27 13:07:12 +02:00
Johannes Lohrer
0669163ea3 more cleaning... 2014-07-26 14:00:21 +02:00
Johannes Lohrer
6cbe51a0c5 removed out of date thaumcraft api 2014-07-26 13:57:42 +02:00
Johannes Lohrer
395aafa03a Re added Forestry, Railcraft and ThermalExpansion 
Closes #20.
 2014-07-26 13:42:29 +02:00
Florian Nücke
4be960a693 Removed unnecessary init in constructor from unifont parser. 2014-07-26 13:37:30 +02:00
Florian Nücke
b8519b432a Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-26 13:32:28 +02:00
Florian Nücke
a6f6aa1476 Fixed being able to delete file system folder itself in unbuffered mode, closes #434. 
Fixed empty file system folders in the saves folder disappearing while still in use (also only relevant for unbuffered mode).
 2014-07-26 13:31:59 +02:00
Florian Nücke
c2ac9aca38 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	build.properties
 2014-07-25 11:33:18 +02:00
Florian Nücke
8044039d2e Adjusted for 1.3.2 release. 2014-07-25 11:31:08 +02:00
Florian Nücke
b46d13b1c1 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-25 10:47:16 +02:00
Florian Nücke
a43f1b6c8f Potential fix for bad state after failed robot move. v1.3.2 2014-07-25 10:46:56 +02:00
Florian Nücke
79b1fb78ba Prep work for Arguments.optXYZ. 2014-07-25 09:46:34 +02:00
Florian Nücke
57a6c85b32 Before I forget again. 2014-07-24 22:38:21 +02:00
Florian Nücke
8ce4b359c1 Cleaned up logging calls. 2014-07-24 16:35:54 +02:00
Florian Nücke
b651a24362 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/java/li/cil/oc/common/asm/SimpleComponentTickHandler.java
 2014-07-24 16:19:49 +02:00
Florian Nücke
1e3b4a2344 Added method to query the address of the screen a GPU is currently bound to. 2014-07-24 16:16:01 +02:00
Florian Nücke
a74157cb3e Catch potential exceptions in tick handler for SimpleComponents. 2014-07-24 15:25:04 +02:00
Florian Nücke
201097b9a2 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/FileSystem.scala
 2014-07-23 21:37:37 +02:00
Florian Nücke
51861e142f Fixed loot disks not making floppy noises. 2014-07-23 21:34:43 +02:00
Florian Nücke
b72060d7a8 Removed some more stuff from LuaJ kernel sandbox that's not needed. 2014-07-23 21:12:55 +02:00
Florian Nücke
5cf5a62316 Prep texture work for #393. 2014-07-23 20:58:11 +02:00
Florian Nücke
b94dbbeb9c Merge branch 'LuaJSucks' of https://github.com/gamax92/OpenComputers 2014-07-23 17:54:09 +02:00
gamax92
7331f42b0b Fix collectgarbage 
Converted String switch case to if statements
 2014-07-23 09:43:27 -06:00
Florian Nücke
c28db39d8c Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-23 17:28:57 +02:00
Florian Nücke
c3c059558e Added creative tier servers, closes #394. 2014-07-23 17:14:52 +02:00
Florian Nücke
5455f62d94 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-23 14:34:03 +02:00
Florian Nücke
4c9fafcfb0 Merge branch 'istasi-patch-8' 2014-07-23 14:22:10 +02:00
Florian Nücke
530f0ca18f Formatting df.lua, added --si. 2014-07-23 14:21:37 +02:00
Florian Nücke
ca4e285511 Merge branch 'patch-8' of https://github.com/istasi/OpenComputers into istasi-patch-8 2014-07-23 13:59:14 +02:00
Florian Nücke
52006b3bfd Should fix NPE in tablets, closes #427. 2014-07-23 13:56:32 +02:00
Florian Nücke
6bf9423f35 Added IM support for Keyboards, closes #247. Sorry, cba to fiddle in FMP support for these. 2014-07-23 08:09:34 +02:00
Florian Nücke
63bdcad60b Added a bunch of missing Callback doc strings (gpu and fs). 
Exposing component.methods to user programs (so you don't need a proxy to list methods on components).
 2014-07-23 07:57:16 +02:00
gamax92
739852e811 Fix collectgarbage 
Default is now collect, all options are now listed, and error message
changed.
 2014-07-22 12:14:53 -06:00
Florian Nücke
276c543e6d Updated CCL/FMP deps to 1.7.10 because why not. 2014-07-22 18:49:55 +02:00
Florian Nücke
ecaa8bd349 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/client/KeyBindings.scala
	src/main/scala/li/cil/oc/client/gui/ServerRack.scala
	src/main/scala/li/cil/oc/util/Audio.scala
 2014-07-22 18:46:41 +02:00