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
4,754 Commits 29 Branches 143 Tags
Commit Graph

4754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
a5d5c6c691 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.7.10 
Conflicts:
	build.properties
 2015-06-14 16:14:42 +02:00
Florian Nücke
688f5105cf Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-06-14 16:13:56 +02:00
Florian Nücke
d474313a02 I keep forgetting to build these on the old distro... 2015-06-14 16:13:34 +02:00
Florian Nücke
a70e4077f2 Adjustments for 1.8. 2015-06-14 16:02:10 +02:00
Florian Nücke
9d5c58cc61 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/resources/assets/opencomputers/recipes/default.recipes
	src/main/scala/li/cil/oc/common/init/Items.scala
 2015-06-14 15:54:25 +02:00
Florian Nücke
6e34f1d1ae Added manual entry and tooltip for data card, and increased cost a bit. 2015-06-14 15:50:26 +02:00
Florian Nücke
a7267d143e Added texture for data card, added soft and hard input size limits and added energy costs. 2015-06-14 15:25:21 +02:00
Florian Nücke
3220d04651 Merge branch 'datacard' of https://github.com/Kubuxu/OpenComputers into data-card 2015-06-14 14:44:01 +02:00
Florian Nücke
4abd0cf3ce Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/Loot.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
 2015-06-14 14:23:48 +02:00
Florian Nücke
d6425b9bee Merge branch 'master' of https://github.com/magik6k/OpenComputers into master-MC1.7.10 2015-06-14 14:11:30 +02:00
Florian Nücke
f108973315 Listened to a bunch of IntelliJ's suggestions. 
inb4 everything broke.
 2015-06-14 14:11:07 +02:00
Łukasz Magiera
dd184681c9
Fixed network stack multiple tcp connections 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-06-14 13:59:58 +02:00
Florian Nücke
b0dc3a2d84 Fixed keyboard.isKeyDown for chars (strings), making use of the utf8 lib when available (Lua 5.3). Closes #1214. 
Thanks to @bawr for pointing out the bug in the first place.
 2015-06-14 13:53:11 +02:00
Florian Nücke
83b47501d6 Hopefully fixes issue with uninitialized loot disks. Closes #1191. 2015-06-14 13:42:01 +02:00
Florian Nücke
0cc849189c Fixed hover boot rendering. 2015-06-14 12:40:36 +02:00
Florian Nücke
6a96038091 Fixed GL state after pet rendering. 2015-06-14 12:21:16 +02:00
Florian Nücke
d357ce2b0e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-06-14 11:54:45 +02:00
Florian Nücke
d37e42258e Merge branch 'master-MC1.7.10' of https://github.com/gamax92/OpenComputers into master-MC1.7.10 2015-06-14 11:35:45 +02:00
Florian Nücke
c3a6657489 Fixed position of hover boots while sneaking. 2015-06-14 11:34:05 +02:00
gamax92
f4868beff6 Add capslock to keyboard.lua 2015-06-13 20:54:47 -06:00
Florian Nücke
81dd166056 Fixed shoulder robot rendering. 2015-06-13 22:26:49 +02:00
Florian Nücke
5ae30eda26 Well this is kinda ugly... but it should fix #1215. 2015-06-13 02:07:10 +02:00
Florian Nücke
4f759c2c49 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/block/ServerRack.scala
 2015-06-13 02:06:39 +02:00
Florian Nücke
f058ad878c That should be more correct. 2015-06-13 02:03:57 +02:00
Florian Nücke
57ca391fd8 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/integration/Mods.scala
 2015-06-12 00:24:56 +02:00
Florian Nücke
e6b9184059 Merge branch 'bc7' into master-MC1.7.10 2015-06-12 00:19:38 +02:00
Florian Nücke
4727f53920 Require BC 7.0.9 for the extension length fix. 2015-06-12 00:13:28 +02:00
Florian Nücke
c92dfe413c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into bc7 2015-06-12 00:11:04 +02:00
Florian Nücke
4fc4f60246 Update BC dep to 7.0.9. 2015-06-12 00:10:36 +02:00
Florian Nücke
f255b4cea8 Make NoMemoryRequirements inheritable. 2015-06-12 00:10:18 +02:00
Florian Nücke
c624cad913 Enable Lua 5.3 by default. 2015-06-12 00:00:37 +02:00
Florian Nücke
a1be494134 Updated native libs to allow loading UTF8 lib via JNLua and expose it to sandbox. 2015-06-11 23:59:51 +02:00
Florian Nücke
fe73562563 Fixes incorrect status message for non-RAM-archs (still showed "insert some RAM" when it shouldn't). 2015-06-11 20:51:39 +02:00
Florian Nücke
504ae88308 Cleaned up / homogenized screen GUI some more. 2015-06-11 20:37:56 +02:00
Florian Nücke
8db38a3121 Added note to self regarding external use of an internal class. 2015-06-11 20:37:16 +02:00
Florian Nücke
18c901c80b Properly migrate CPUs that were manually configured to a Lua 5.2 architecture to the new class name and properly handle errors when instantiating architectures. Closes #1213. 2015-06-11 20:36:36 +02:00
Florian Nücke
7625b723e5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-06-09 21:53:31 +02:00
Florian Nücke
76d7a6afc2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-06-09 21:52:56 +02:00
Florian Nücke
fdcdb2c7c5 Should fix incorrect coordinates in mouse scroll event in scaled GUIs, closing #1212. 2015-06-09 21:52:38 +02:00
Florian "Sangar" Nücke
d06f7e8048 Merge pull request #1208 from megamandos/grammar 
Documentation improvements.
 2015-06-09 19:58:51 +02:00
Johannes Lohrer
cd3b6119b3 new branch 2015-06-09 16:45:32 +02:00
Eric Johnson
6aa3c80f48 Fixed some formatting and spelling mistakes in the English manual. 2015-06-09 08:50:48 -04:00
Florian Nücke
00fc0da670 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.gradle
 2015-06-08 23:06:07 +02:00
Florian Nücke
6bf16b316e Fixed off-by-one in os.date(), closes #1209. 2015-06-08 20:28:32 +02:00
Florian Nücke
003e3c4084 Use mod version as coremod version, too. 2015-06-08 20:05:47 +02:00
Florian Nücke
0e485e17a3 Fixed potential NPE when checking for new SimpleComponent annotation. 2015-06-08 19:59:08 +02:00
Florian Nücke
154ad9e1d0 Added BC7 library integration for EEPROMs. 2015-06-07 16:45:48 +02:00
Florian Nücke
92a3b8f93f Compile against BC7. 2015-06-07 14:41:45 +02:00
Florian Nücke
db7e23c03e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-06-07 13:52:04 +02:00
Florian Nücke
d984658ea5 Fixed update check, closes #1200. 
That's what I get for listening to people's advice :P [the replaceIn *did* serve a purpose after all... oh well, I suppose this is a cleaner solution now anyway]
 2015-06-07 13:51:43 +02:00