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

4587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
2f7b22fc0b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-19 13:12:21 +02:00
Florian Nücke
78ddda0426 Homogenized indentation in config. 2015-04-19 13:07:06 +02:00
Florian Nücke
30d722e19d Limit speed of hologram.setRaw a bit, to lower worst-case bandwidth use, but made it configurable. 
Also moved hologram server-side settings to extra category in config.
 2015-04-19 13:05:33 +02:00
Florian Nücke
7fc4d67dee Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 2015-04-19 11:32:34 +02:00
Florian Nücke
dd975cc034 Merge branch 'patch-1' of https://github.com/CaitlynMainer/OpenComputers into master-MC1.7.10 2015-04-19 11:32:07 +02:00
Florian Nücke
662ef4722b Fixed a few links in manual, closes #1086. 
Thanks @rashdanml.
 2015-04-19 11:21:28 +02:00
Caitlyn
1dc12b54a5 fixed typo for Ink Cartridge 
<Kodos> Can you go PR into the proper branch of OC's en_US file to fix 'Ink Cartidge' to say Ink Cartridge
 2015-04-18 23:06:25 -05:00
cyber01
3fc9e96438 Updated russian translation 2015-04-19 04:11:44 +03:00
Johannes Lohrer
72a4a0e476 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into updated_recipes 
Conflicts:
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
 2015-04-18 22:34:58 +02:00
Johannes Lohrer
c81efe9779 moved recipes into own class for vanilla 
added gregtech recipe options
 2015-04-18 22:24:30 +02:00
Florian Nücke
dc4acd13d6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-18 20:50:15 +02:00
Florian Nücke
be071be9a2 Made recipe set extraction a bit more generic, added the peaceful set. 2015-04-18 20:42:35 +02:00
Florian Nücke
8e024c3106 Merge branch 'master-MC1.7.10' of https://github.com/dgelessus/OpenComputers into master-MC1.7.10 2015-04-18 20:27:55 +02:00
Florian Nücke
24515534c1 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-18 20:23:29 +02:00
Florian Nücke
4bbe6328b1 Should fix #1083 for good, I think. 2015-04-18 20:23:18 +02:00
Florian Nücke
cbd54883ac Bump version number. 2015-04-18 20:22:35 +02:00
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