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
706 Commits 29 Branches 143 Tags
Commit Graph

706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
cce2d4fa6e Merge branch 'master' into 1.2 2014-01-11 13:26:06 +01:00
Florian Nücke
9370dd9658 fixed screen gui not necessarily using origin screen for information (power state and resolution) 2014-01-11 13:24:12 +01:00
Florian Nücke
d0deb19664 adjusted gregtech recipe for transistor to avoid collision with redstone conductor recipe 2014-01-11 12:23:11 +01:00
Florian Nücke
eb59999b18 recipes for additional ram modules, closes #69 2014-01-10 22:33:07 +01:00
Florian Nücke
ad0e914512 adjusted memory for tiered slots; adjusted settings for additional memory tiers and added compatibility check for older configs 2014-01-10 21:39:29 +01:00
Florian Nücke
1f084dadb9 fixed the order of the coordinates navigation.getPosition returns, so that they're in Minecraft order: x, y, z and not x, z, y as they currently are 2014-01-10 21:23:57 +01:00
Florian Nücke
5fd746a49d Merge branch 'more_ram' into 1.2 
Conflicts:
	assets/opencomputers/textures/items/memory0.png
	assets/opencomputers/textures/items/memory1.png
	assets/opencomputers/textures/items/memory2.png
 2014-01-10 20:42:05 +01:00
Florian Nücke
879e8aa784 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into 1.2 2014-01-10 20:41:16 +01:00
Florian Nücke
0cd901e7ff adjusted version number for 1.1 release v1.1.0 2014-01-10 17:32:29 +01:00
Florian Nücke
128b3ae03b running the debug hook that is used to check for timeouts more often, may help with #78 2014-01-10 17:31:10 +01:00
Florian Nücke
7fc04b4e4a slots in computer cases are now tiered, closing #72. 2014-01-10 17:26:39 +01:00
Florian Nücke
27102a8be1 updated mcmod.info to conform to the format described at https://github.com/MinecraftForge/FML/wiki/FML-mod-information-file 2014-01-10 00:32:51 +01:00
Florian Nücke
4a5fb522a1 Linux natives built against older libs to allow them to work on older systems (built on Debian 4... so yeah, update your Linux if you still have issues) 2014-01-10 00:16:56 +01:00
Florian Nücke
0e2224f7c0 added new localizations to pack.mcmeta 2014-01-09 18:09:53 +01:00
Florian Nücke
4c116987e2 rebuilt item textures and tweaked a few of them slightly 2014-01-09 17:31:56 +01:00
Florian Nücke
641d7437d1 made cards actually use the card part in their recipe, instead of a pcb... 2014-01-09 14:21:41 +01:00
Florian Nücke
2399b774b6 made some of the item textures look a little less... flat 2014-01-09 13:16:55 +01:00
Florian Nücke
953b2cee08 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-01-08 21:17:00 +01:00
Florian Nücke
f40e108944 new ram graphics (from set planned for extended ram tiers) 2014-01-08 21:16:50 +01:00
Johannes Lohrer
8a05c369d3 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-01-08 21:16:17 +01:00
Johannes Lohrer
60c102752e changed ic2 names do to name change 2014-01-08 21:16:05 +01:00
Florian Nücke
986f7f76cb added ram tier 4 and 5 and adjusted textures 2014-01-08 21:08:40 +01:00
Florian Nücke
5a52c6988f added comment for graphics card driver bugfix to avoid reverting the change in the future when nobody remembers that it was a fix... 2014-01-08 21:06:28 +01:00
Florian Nücke
f6977b7b85 Merge pull request #73 from Pyrolusite/patch-1 
French translation update
 2014-01-08 05:22:40 -08:00
Pyrolusite
68e6432d88 French translation update 2014-01-08 14:18:30 +01:00
Florian Nücke
993e67a2e4 manual background rendering for screens instead of using the tessellator since that seems to have caused crashes on certain graphics cards with certain drivers (see #31) 2014-01-07 14:10:28 +01:00
Florian Nücke
e5277b9b41 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-01-07 12:18:01 +01:00
Florian Nücke
43e91991cf Merge pull request #71 from Pyrolusite/master 
Create fr_FR.lang
 2014-01-07 03:17:33 -08:00
Pyrolusite
2e27c4aa52 Create fr_FR.lang 
May need some feedback from fellow French speakers, but this should be fine imo.
 2014-01-07 11:52:22 +01:00
Florian Nücke
6f3475a353 avoid error when edit is trying to check readonly-ness of virtual folders 2014-01-07 00:28:41 +01:00
Florian Nücke
8594a3e2c7 registering items in ore dictionary if they aren't already there that aren't in it by default (hi gregtech), fixes #67 2014-01-06 23:49:04 +01:00
Florian Nücke
4cefeb24b5 fixed an out of index error in the crafting handler; moved dependency stuff to mcmod.info v1.1.0pre4a 2014-01-06 21:59:15 +01:00
Florian Nücke
93db93ae39 removed a sided function from robot logic (annotations above comments == evil); suppressing LimitReachedException in computer callback logging 2014-01-06 21:14:42 +01:00
Florian Nücke
6c1a7c595e Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-01-06 18:27:07 +01:00
Florian Nücke
18ef03965c added project red mod license info; added rough build instructions for the native library 2014-01-06 18:26:34 +01:00
Florian Nücke
8aaace5f31 Merge pull request #66 from LordFokas/master 
Added pt_PT translation
 2014-01-06 08:59:20 -08:00
LordFokas
a3b7fae5ff Added pt_PT translation 2014-01-06 16:55:53 +00:00
Florian Nücke
2dd8da26fc grabbing screen touch coordinates on the client side and sending them as a click to the server to avoid loss of accuracy (block activation events only have a resolution of 16x16 apparently). closes #57. again. v1.1.0pre4 2014-01-06 17:32:42 +01:00
Florian Nücke
3b59b53d5c added setting to allow logging of tracebacks for exceptions that occurred in Lua callbacks (disabled per default to avoid spamming the log with InvalidArgumentExceptions and the like); moved argument parsing and result pushing to extended lua state and added capability to push maps as tables, meaning callbacks can now return maps, too 2014-01-06 17:19:04 +01:00
Florian Nücke
9478907a58 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers (more generic bounds check. also: yay for lack of coordination :P) 
Conflicts:
	li/cil/oc/common/block/Cable.scala
 2014-01-06 01:10:22 +01:00
Johannes Lohrer
f4d8f8c51f cable only checks neighbor blocks if y >= 0 , Fixes #63 2014-01-06 01:00:52 +01:00
Florian Nücke
e266ccbcc3 added checks for invalid coordinates when fetching tile entities for neighbors, fixes #63 2014-01-06 01:00:51 +01:00
Florian Nücke
c1e283ca87 fixed bug in term.write() that caused issues with writing long strings. could have sworn I tested this and it worked once... was probably before I added word wrapping. anyway, closes #61 2014-01-05 19:12:28 +01:00
Florian Nücke
0f7718dcb0 fixed side of redstone_changed event not being translated to computer case's local side, closes #60 2014-01-05 18:18:14 +01:00
Florian Nücke
4b4a59258f added a null check that may avoid #37, although I can't reproduce it and can't see how it could come to that. possibly mcpc+ related. v1.1.0pre3 2014-01-05 14:49:34 +01:00
Florian Nücke
bd57550bd2 fixed touch coordinates on certain multiblock screen formats in combination with certain resolutions, closes #57 2014-01-05 13:54:10 +01:00
Florian Nücke
d026b61295 added setting to allow enabling bytecode loading. use this at your own risk, and only if you're aware just how exploitable this can be... closes #58 for now 2014-01-05 13:27:33 +01:00
Florian Nücke
2b50e0b956 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-01-05 13:09:09 +01:00
Florian Nücke
1161d6b80a marked passive tile entities and manually triggering an update for their blocks on chunk/world load to connect them to the component update, since this apparently could fail when scheduling the update (see issue #46) 2014-01-05 13:08:05 +01:00
Florian Nücke
2524f97029 Merge pull request #56 from crafteverywhere/patch-1 
Update zh_CN.lang
 2014-01-04 12:04:38 -08:00