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

4671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
02dd439e6a Allow redrawing holograms a tad faster, closes #1064. 
Also added a new method, `setRaw`, takes a string (byte array) with each byte being the color for a voxel. Allows setting the whole hologram data at once, allowing for even faster redrawing / swapping of states.
 2015-04-18 20:22:19 +02:00
dgelessus
0a14e0532e Add peaceful-friendly recipe file 
+ small tweak to default recipes
 2015-04-18 17:16:10 +02:00
Florian Nücke
cd8c79480e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-18 16:35:56 +02:00
Florian Nücke
87d25abcb2 Fixed absolute paths in manual. 2015-04-18 16:35:13 +02:00
Florian Nücke
6bcd57ee8d Should fix issues with display lists leaving MC's GlStateManager in a confused state, closing #1083. 2015-04-18 15:12:00 +02:00
Florian Nücke
fba871697e Adjustments for 1.8. 2015-04-18 13:33:42 +02:00
Florian Nücke
61f7a0c821 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/entity/Drone.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
 2015-04-18 13:07:03 +02:00
Florian Nücke
060f3bb5d8 Fixed OpenOS being listed twice in creative tab/NEI. 2015-04-18 13:04:09 +02:00
Florian Nücke
1bda68f59d Merge branch 'patch-23' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2015-04-18 12:58:29 +02:00
Florian Nücke
e4dc95580d Emitting particle effects from robots when they try to move but fail, as a visual indicator. 
Added forced pause even if move fails, to avoid particle spam. Makes detect() a bit more useful (since that'll now be faster than just trying to move).
 2015-04-18 12:54:33 +02:00
Florian Nücke
d03e78b0cb Made time limit enforcement in __gc wrapper more memory friendly, closes #1079. 2015-04-17 20:14:51 +02:00
Florian Nücke
c62feb7136 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-04-17 18:41:27 +02:00
Florian Nücke
e1bad9735f Centralized logic that prints last computer crash reason when analyzed. 
This way it'll also work for third-party machines.
 2015-04-17 18:40:22 +02:00
Florian "Sangar" Nücke
170cb4a406 Merge pull request #1078 from cyber01/RU_doc 
Russian translation for manual
 2015-04-17 18:39:27 +02:00
cyber01
a619c0dd11 Added russian translation for manual 2015-04-17 18:51:07 +03:00
Florian Nücke
c42334ba16 Fixed previous commit breaking computers after stopping once. 2015-04-17 13:36:14 +02:00
Florian Nücke
15f5609a0e Should fix potential leakage of drones. 
Cleaned up robot name list a bit.
 2015-04-17 13:08:33 +02:00
cyber01
32e3b7a06d Create branch 2015-04-16 12:48:22 +03:00
Florian Nücke
effe8ebea1 Merge branch 'patch-1' of https://github.com/shadowkat10/OpenComputers into master-MC1.7.10 2015-04-16 11:17:02 +02:00
Florian Nücke
2b2c8ce401 Merge branch 'patch-1' of https://github.com/KamranMackey/OpenComputers into master-MC1.7.10 2015-04-16 11:14:56 +02:00
shadowkat10
f79faa924a Update robot.names 
Added names from games by Christine Love, fun stuff.
- Emilia
- Hyun-ae
- Mute
 2015-04-16 14:42:16 +10:00
Kamran Mackey
55b5ea8662 Added Baymax as a robot name. 
Last time i'm doing this...
 2015-04-15 13:53:19 -06:00
Vexatos
e294ec4050 Actually tried fixing OPPM auto-installer 2015-04-15 21:27:26 +02:00
Vexatos
8eaeb46a0f Update oppm.lua 2015-04-15 21:23:49 +02:00
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
5ac6930e46 Fixed wrench texture. 2015-04-14 14:45:44 +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
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