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

1139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
5de05dfe90 added two more tiers for cpus, since those will be used to control the number of components a server is able to address; server item texture and tooltips 2014-01-13 17:39:27 +01:00
Florian Nücke
b1a78975e8 server item gui and inventory is working; fixed rendering of 3d items when in a gui with tiered slots 2014-01-13 16:21:17 +01:00
Florian Nücke
d98e0b7317 post-merge adjustments 2014-01-13 12:22:35 +01:00
Florian Nücke
b52181346b Merge branch '1.2' into servers 
Conflicts:
	li/cil/oc/Blocks.scala
	li/cil/oc/Items.scala
	li/cil/oc/common/GuiType.scala
 2014-01-13 12:19:10 +01:00
Florian Nücke
d19e0f641f Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into 1.2 2014-01-12 23:15:19 +01:00
Florian Nücke
072600ae46 adjusted version for next release v1.1.1 2014-01-12 20:56:14 +01:00
Florian Nücke
8643fb4338 also checking whether the nbt data of an item changed when used by a robot, to return true in that case (e.g. for ic2 electric items such as the mining laser); explicit check for mining laser use to avoid robots shooting themselves 2014-01-12 20:31:42 +01:00
Florian Nücke
92c9a46d8c fixed bundled redstone output resetting after loading 2014-01-12 15:16:45 +01:00
Florian Nücke
8475597838 do vertical multi-block screen merges first to prefer in-chunk merges, hopefully helping a bit with non-determinism when chunk loading is involved 2014-01-11 22:04:21 +01:00
Florian Nücke
0578b4af15 tweaked obstacle detection for wireless networking a bit to avoid self-collisions and have a better distribution of the samples on diagonals 2014-01-11 21:59:59 +01:00
Florian Nücke
7b9a8d4cda made screens accept redstone signals; using redstone pulses on screens to turn them on or off (it's a toggle), closes #77 2014-01-11 16:20:38 +01:00
Florian Nücke
cf70a33ea4 changed the way screen power consumption is computed. it's no only computed by the origin and no longer the actual number of pixels, but the relative number of pixels (based on the current resolution), with the cost being scaled based on the maximum resolution versus the resolution of the basic screen; screens can now be turned off to conserve power. turning them back on consumes as much energy as one cycle with a fully lit screen would, to avoid people trying to avoid the cost by turning screens off and on again at the right time (when the screen cost is actually computed, which doesn't happen every tick unless so configured - see power.tickFrequency) 2014-01-11 13:41:50 +01:00
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
0add1e3601 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into StargateTech2 2014-01-09 17:35:10 +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
72751b1acb added power consumption for sending messages via the abstract bus; limiting size of packets sent over the abstract bus (like normal network packets) 2014-01-09 17:31:03 +01:00
Florian Nücke
78f0042bd3 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into sgt 2014-01-09 14:22:23 +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
df5fce3f7a recipe for abstract bus card and dependency on stargatetech2 mod for loading order 2014-01-09 14:12:47 +01:00
Florian Nücke
161098a3fb Merge branch 'master' into sgt 
Conflicts:
	li/cil/oc/OpenComputers.scala
 2014-01-09 13:56:36 +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