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

2057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
f0f4a699e1 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	build.properties
 2014-07-14 14:09:46 +02:00
Florian Nücke
fa4413fd56 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 
Conflicts:
	build.properties
 2014-07-14 14:09:07 +02:00
Florian Nücke
e7d64fa6d0 Version bump. v1.3.1 2014-07-14 14:08:12 +02:00
Florian Nücke
e99dce8a1f Adjusted for 1.7.10. 2014-07-14 00:15:09 +02:00
Florian Nücke
f48bbc79ec Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-14 00:14:35 +02:00
Florian Nücke
9ebc60d9f4 Made fake player profile "complete" to avoid it not working on dedicated servers (even though partial profiles seem to be something that should be used for this, but hey...) 2014-07-14 00:13:27 +02:00
Florian Nücke
b4bb25f066 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-13 23:54:02 +02:00
Florian Nücke
586aef4538 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-13 23:52:22 +02:00
Florian Nücke
0321a7816c Fixed math.random, closes #400. 2014-07-13 23:19:15 +02:00
Florian Nücke
3224d6af44 Updated to forge recommended and updated IC2 API (and using their maven now). 2014-07-13 14:43:00 +02:00
Florian Nücke
36eb26eedd Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-12 23:05:44 +02:00
Florian Nücke
289ee04c13 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-12 23:04:50 +02:00
Florian Nücke
da5f2590aa Shuffling lib load order a bit to see if it avoids the arm lib being sorta-kinda loaded on non-arm Linux. 2014-07-12 23:04:15 +02:00
Florian Nücke
f40ab563f7 Backported robot fake player name fix from 1.7.10... totally forgot about that one... *sigh* 2014-07-11 20:18:16 +02:00
Florian Nücke
1c405630cc Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-11 17:07:14 +02:00
Florian Nücke
f9f47539bc Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-11 17:05:43 +02:00
Florian Nücke
739d0ab892 Fixed recursive recipe includes. Closes #387. 2014-07-11 17:05:22 +02:00
Florian Nücke
24b8875c5a Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-11 14:12:41 +02:00
Florian Nücke
b00a6fed0f Adjustments for 1.7. 2014-07-11 14:12:26 +02:00
Florian Nücke
4a2629a4d3 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-11 14:11:19 +02:00
Florian Nücke
5e268af84b Added safety try-catch to machine loading code, to avoid crashes for unexpected states. 
Added callback doc for experience upgrade and chunkloader upgrades.
 2014-07-11 14:10:54 +02:00
Florian Nücke
68b8df0ef0 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-11 01:16:25 +02:00
Florian Nücke
02e72723ef Fixed side for Keyboard's canPlaceBlockOnSide check. 2014-07-11 01:15:33 +02:00
Florian Nücke
ddec69c5fd Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-10 11:26:54 +02:00
Florian Nücke
41c9d5e70f Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-10 11:25:54 +02:00
Florian Nücke
d24907b7ab Fixed keyboard behavior some. 
I'm not really happy with this fix, because it adds special behavior for multiblock screens where it shouldn't be, but meh.
 2014-07-10 11:25:11 +02:00
Florian Nücke
139ffc9f4a Making sure paths used for file system data storage (hdds, floppies) are directories or don't exist by trying to delete them if they're files, instead of just giving up - since apparently these can appear in some obscure scenario that can't be reproduced anymore. 2014-07-09 23:05:50 +02:00
Florian Nücke
1df13cc8d6 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-09 18:20:05 +02:00
Florian Nücke
b87e5b4346 Adjusted for 1.7. 2014-07-09 18:12:17 +02:00
Florian Nücke
57c98e4b0f Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-09 17:43:09 +02:00
Florian Nücke
4c70bb79c5 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-09 17:42:40 +02:00
Florian Nücke
4e8a48a56f Catching potential errors in __gc methods when persisting computers. 2014-07-09 17:37:36 +02:00
Florian Nücke
bf9de41a7b Fixed a potential (non-crashing) NPE. 2014-07-09 17:21:32 +02:00
Florian Nücke
5274cb8da0 Corrected mistake in onConnect/onDisconnect examples in JDoc of Environment interface in API. 2014-07-09 17:05:04 +02:00
Florian Nücke
c124a650df Improved performance of component callbacks. 
Enforcing tighter time limit on user __gc methods.
 2014-07-09 17:00:06 +02:00
Florian Nücke
88aa162ad7 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 
Conflicts:
	build.properties
 2014-07-08 20:43:07 +02:00
Florian Nücke
24fccd0dfe Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
 2014-07-08 20:42:42 +02:00
Florian Nücke
908800df54 Removed lies. 2014-07-08 20:42:11 +02:00
Florian Nücke
e03e63323c Bumpitybump. v1.3.0 2014-07-08 20:40:19 +02:00
Florian Nücke
d71b37cc51 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-08 18:41:44 +02:00
Florian Nücke
8363c43d03 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-08 18:41:10 +02:00
Florian Nücke
b9d1a37b28 Merge pull request #383 from gamax92/LuaJSucks 
Fix More LuaJ things.
 2014-07-08 18:40:27 +02:00
Florian Nücke
ce1231ddde Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-08 16:54:28 +02:00
Florian Nücke
b1a1e4a64e Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/util/LuaStateFactory.scala
 2014-07-08 16:52:57 +02:00
Florian Nücke
972b12500a Fixed 'screen.getAspectRatio' value being recomputed incorrectly. 2014-07-08 16:37:45 +02:00
Florian Nücke
4095c0eda8 Made native library loading less... special-case-laden. Just try each and every shipped library until one works. 2014-07-08 15:10:58 +02:00
Florian Nücke
6b7120607a Fixed derp in OpenIRC's /lua command. 2014-07-08 13:13:21 +02:00
gamax92
cf51cd2591 Just a little note 2014-07-07 21:51:40 -06:00
gamax92
d38e08f102 fix txtToken, lexerror 2014-07-07 21:42:53 -06:00
Florian Nücke
5910a169c4 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-08 04:32:23 +02:00