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

4276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
114fb63c1e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-15 19:37:27 +02:00
Florian Nücke
b6d6c5cde6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-04-15 19:29:51 +02:00
Florian Nücke
8b81e44481 Should fix potential NPE in worker thread when arch is re-evaluated, closes #1070. 
May also fix other related problems of the architecture previously potentially changing mid-execution.
 2015-04-15 19:29:31 +02:00
Florian "Sangar" Nücke
5ece86ce21 Merge pull request #1063 from Vexatos/patch-22 
OPPM is apparently craftable now.
 2015-04-14 16:03:39 +02:00
Vexatos
1a66fbf7a9 OPPM is apparently craftable now. 2015-04-14 15:59:04 +02:00
Florian Nücke
b61f48b664 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 2015-04-14 14:46:10 +02:00
Florian Nücke
5ac6930e46 Fixed wrench texture. 2015-04-14 14:45:44 +02:00
Florian Nücke
446f1a5ad3 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 2015-04-14 14:22:50 +02:00
Florian Nücke
35dcb70f12 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-14 14:22:21 +02:00
Florian Nücke
85a07e4a3c Header levels. 2015-04-14 14:21:41 +02:00
Florian Nücke
9f72013387 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 
Conflicts:
	build.properties
 2015-04-14 13:12:58 +02:00
Florian Nücke
362edc0320 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-14 12:51:27 +02:00
Florian Nücke
531e5847d0 Fixed chamelium blocks being registered breaking mipmaps. Closes #1061. 2015-04-14 12:50:37 +02:00
Florian Nücke
fe8f8e3341 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-14 11:00:50 +02:00
Florian "Sangar" Nücke
d334dd1a27 Merge pull request #1062 from rashdanml/master-MC1.7.10 
Documentation updates/changes/overhauls/etc
 2015-04-14 11:00:34 +02:00
Florian Nücke
39c5d2c933 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-14 10:55:05 +02:00
Florian Nücke
cefe7f4f00 Made speed of gpu.setPaletteColor depend on GPU tier and made it a lot faster. 
Better recipe for OPPM disk.
 2015-04-14 10:54:40 +02:00
Rashdan
b725cb9a51 Major/minor changes, made sure everything was linked, reworded some stuffs. 2015-04-13 22:52:24 -07:00
Florian Nücke
518e0004e9 Remove duplicate entries in Lua interpreter tab completion. 2015-04-14 02:33:36 +02:00
Florian Nücke
e54536dd9c Not ignoring index in Lua interpreter tab completion anymore. 2015-04-14 01:44:35 +02:00
Florian Nücke
d9070d6fb3 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-14 00:35:23 +02:00
Florian Nücke
5349645b1c Fix potential crash when trying to render a char that could not be generated. 2015-04-14 00:33:39 +02:00
Florian Nücke
56e3f69ec4 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/client/Textures.scala
	src/main/scala/li/cil/oc/common/Loot.scala
	src/main/scala/li/cil/oc/common/block/Print.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
 2015-04-14 00:02:36 +02:00
Florian Nücke
58b50ad39e Polished up documentation some more. 
Added "home" tab to manual. In case people are people.
 2015-04-13 23:33:28 +02:00
Florian Nücke
85a45e8633 Disabled printed block opacity by default, added setting to enable. Rendering too derpy with MC's lighting engine for this for my taste. 
Added wrench tool, mostly for MC 1.8.
 2015-04-13 21:37:13 +02:00
Florian Nücke
0e883fb08b Added functionality to allow defining recipes for (built-in) loot disks. 
OpenOS recipe is defined differently now! OPPM now has a recipe.
 2015-04-13 19:06:54 +02:00
Florian Nücke
c57302ccc0 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
	src/main/scala/li/cil/oc/common/tileentity/Print.scala
 2015-04-13 03:40:25 +02:00
Florian Nücke
3fe3f81d7d Make prints set to emit redstone but not having a second state emit redstone always. 2015-04-13 03:38:21 +02:00
Florian Nücke
82e870e626 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
 2015-04-13 02:25:31 +02:00
Florian Nücke
711bcbfbd8 Fixed equipped item rendering in robots, closes #1059. 2015-04-13 02:24:43 +02:00
Florian Nücke
c0ff965fa7 Fixed regression in redstone handling of print with only one state. 
Only rendering robot labels once per frame (not in both render passes, herp).
 2015-04-13 02:24:34 +02:00
Florian Nücke
aa2d7e8b11 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
 2015-04-12 16:50:01 +02:00
Florian Nücke
10a640d8ee Give a free manual to players once. 2015-04-12 16:46:03 +02:00
Florian Nücke
70a5f86841 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
 2015-04-12 15:22:09 +02:00
Florian Nücke
9fb1406f1c Also registering manual as craftingBook in oredict. 2015-04-12 15:02:58 +02:00
Florian Nücke
fe66cec9d6 More cleanup, pulled common functionality from text and code segments into trait. 2015-04-12 14:49:33 +02:00
Florian Nücke
c6bfcb464e Moved link handling into link segment, using mouse click handler. 2015-04-12 14:17:55 +02:00
Florian Nücke
2b6a257cda Improved culling for document rendering a bit, cleaned up code some. 2015-04-12 14:11:31 +02:00
Florian Nücke
9280fc7de4 Added a basic tutorial to the manual. 2015-04-11 20:20:09 +02:00
Johannes Lohrer
419697a0c7 check for gt_api class, to prevent crash when using GT6 
GT6 still beeing NOT supported! This is just to prevent crashing!
 2015-04-11 19:46:54 +02:00
Florian Nücke
f192155c68 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-11 17:44:52 +02:00
Florian Nücke
91bf2c79c2 Added FilteredEnvironment to allow dynamically hiding callbacks when they get connected to a computer. Closes #1010. 2015-04-11 17:33:18 +02:00
Florian Nücke
6d7cc3c09e EEPROM now also can be cleared via self-crafting, floppies keep their color, closes #1052. 
Added some more documentation on the manual itself.
Fixed typos and stuff in documentation.
 2015-04-11 17:00:10 +02:00
Florian Nücke
62d787780d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-11 12:18:54 +02:00
Florian Nücke
f4c4d4c477 FluidStack.fluidID -> FluidStack.getFluid.getId 2015-04-11 12:18:41 +02:00
Florian Nücke
e5c1e15713 Adjustments for 1.8. 2015-04-11 12:16:53 +02:00
Florian Nücke
afde34d47a Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
 2015-04-11 11:39:48 +02:00
Florian Nücke
b7169ebdbc Removed test dead link... 2015-04-11 11:25:06 +02:00
Florian Nücke
3d133bed59 Fixed some dead links, formatting. 2015-04-11 11:23:15 +02:00
Florian Nücke
b8a24204b8 Color dead links red. 
Typos, consistency, removed example page.
 2015-04-11 11:16:16 +02:00