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

4213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Florian Nücke
d6ccf52113 Added a store method to the AE2 controller/interface driver, allows writing results a filtered query to a database upgrade. Closes #1206. 2015-06-07 12:45:32 +02:00
Florian Nücke
534921a256 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/resources/assets/opencomputers/lang/fr_FR.lang
	src/main/scala/li/cil/oc/util/InventoryUtils.scala
 2015-06-07 12:16:36 +02:00
Florian Nücke
ac117c2fb5 Added annotation to allow marking classes implementing SimpleComponent to be skipped, closes #1194. 2015-06-07 12:10:57 +02:00
Florian Nücke
adf68933ab Didn't need you after all. 2015-06-07 12:03:11 +02:00
Florian Nücke
dcdf5f5215 Merge branch 'patch-3' of https://github.com/LizzyTrickster/OpenComputers into master-MC1.7.10 2015-06-07 12:01:57 +02:00
Florian Nücke
3d7386e83b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-06-07 12:01:34 +02:00
Florian Nücke
6c8370bcb3 Fixed interaction of agents with trapped chests adjacent to normal chests in certain orientations (would insert/remove into/from wrong chest). Closes #1205. 2015-06-07 12:01:22 +02:00
Florian Nücke
8dd4d841a9 Before I forget again, make AE2 filter ignore size if passed size is zero (makes it easier to use stacks pulled from databases as filters, since the size field doesn't have to be nulled). 2015-06-07 11:41:07 +02:00
Florian Nücke
6905742614 Drones are now Ninjas. Closes #1204. 2015-06-07 11:31:24 +02:00
Florian Nücke
a028beadec Added annotation that can be added to architectures, to mark them as not requiring memory (e.g. to allow assembling MCUs with CPUs configured to those architectures without memory being present). Closes #1201. 2015-06-07 11:25:21 +02:00
Florian Nücke
bc29a0b70d Fixed crafting of Lua BIOS and OpenOS floppy using "initialized" items (i.e. EEPROM or floppy that had been installed in a computer/disk drive before). Closes #1199. 2015-06-07 10:58:55 +02:00
Lizzy
a16a819bb2 of > off 2015-06-05 23:24:06 +01:00
Florian "Sangar" Nücke
ab2c532091 Merge pull request #1197 from Mazdallier/patch-3 
Update fr_FR.lang
 2015-06-05 12:07:36 +02:00
Yves
964f349d47 Update fr_FR.lang 2015-06-04 16:34:22 +02:00
Florian "Sangar" Nücke
6c7c28d550 Merge pull request #1196 from cyber01/RU_doc 
Added Creative APU and Hover Boots to Russian manual.
 2015-06-04 14:39:37 +02:00
cyber01
53deb56518 Added Creative APU and Hover Boots 2015-06-04 15:17:20 +03:00
Florian Nücke
7f56153be6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/item/data/PrintData.scala
	src/main/scala/li/cil/oc/util/ExtendedWorld.scala
 2015-06-01 21:58:13 +02:00