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

4661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
f244e5de33 Eh, screw it. 2015-06-25 20:18:19 +02:00
Florian Nücke
11d9470047 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-06-25 20:05:43 +02:00
Florian Nücke
f39eafbbda Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/block/Print.scala
	src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
	src/main/scala/li/cil/oc/common/block/Print.scala
 2015-06-25 20:05:28 +02:00
Florian Nücke
ca87513dc3 How did this magically compile in my IDE again? -.- 2015-06-25 20:05:10 +02:00
Florian Nücke
1d933fd9f5 Allow printing 3D prints that can be walked through (non-colliding), as well as shapes with no texture (texture="") appearing transparent, closes #1238. 
Also improved face culling on 3D prints when rendering, improving render performance in certain scenarios.
 2015-06-25 19:50:12 +02:00
Florian Nücke
64d3f93177 Homogenized item data stuff a bit and trying to avoid NPEs in preconfigured item creation. 2015-06-25 18:25:37 +02:00
Florian Nücke
a60f1c76f1 Should fix tablet durability/energy bar being inverted, closes #1241. 
Also always show bar for hover boots.
 2015-06-25 11:57:06 +02:00
Johannes Lohrer
fb45881cec added FormingPress, LaserEngraver and FluidCanner for Gregtech Recipes Closes #1233 2015-06-21 14:00:46 +02:00
Johannes Lohrer
f4044db8a0 agri craft not 100% working 2015-06-21 13:41:10 +02:00
Florian Nücke
4f4564fb29 Updated Forge version. 2015-06-20 20:42:28 +02:00
Florian Nücke
1fe369e0ff Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.gradle
	build.properties
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/integration/vanilla/DriverCommandBlock.java
 2015-06-20 18:05:52 +02:00
Florian Nücke
18149d0aa1 Updated Forge version. 2015-06-20 17:19:46 +02:00
Florian Nücke
3bea675494 Updated Project Red and ComputerCraft dependencies and adjusted implementations of interfaces as necessary. Closes #1231. 2015-06-20 16:51:24 +02:00
Florian Nücke
1e5b2bdbaf Use plain mode for string.find in edit's find logic, fixes #1234. 
Best issue number yet.
 2015-06-20 15:49:19 +02:00
Łukasz Magiera
dc7b641a54 Merge branch 'master' of https://github.com/magik6k/OpenComputers 2015-06-19 22:58:55 +02:00
Łukasz Magiera
358ebc6b3f
Fixed some bugs, standard require 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-06-19 22:57:51 +02:00
Łukasz Magiera
79bdc54b5c Merge pull request #1 from Vexatos/patch-24 
Update init.lua
 2015-06-19 18:40:01 +02:00
Vexatos
6c808e75c1 Update init.lua 2015-06-19 18:32:31 +02:00
Łukasz Magiera
8ff73598db
Added Plan9k loot disk 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-06-19 12:03:56 +02:00
Florian Nücke
e0f8554637 Make command block driver actually return numeric value (plus text) as it should (instead of always just true). 2015-06-16 22:07:01 +02:00
Florian Nücke
d6354d92a4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-06-16 21:10:00 +02:00
Florian Nücke
4c813d6c8d Added mention of Project Red in redstone I/O block's tooltip. Closes #1225. 2015-06-16 21:08:15 +02:00
Florian Nücke
3bc9484094 Formatting, organized imports, sorting. 2015-06-16 21:06:40 +02:00
Florian Nücke
063b8115d1 Push up warning text in raid two pixels to avoid long text (3 lines) overlapping the inventory label. 
Looks ugly for two lines, but meh.
 2015-06-16 21:05:32 +02:00
Florian Nücke
01e195676c Merge branch 'ec' of https://github.com/DrummerMC/OpenComputers into master-MC1.7.10 2015-06-16 20:52:47 +02:00
Florian Nücke
2b5c703566 Merge branch 'de-translation' of https://github.com/dgelessus/OpenComputers into master-MC1.7.10 2015-06-16 20:40:54 +02:00
DrummerMC
4cf3285989 Added EC Integration 2015-06-16 16:01:17 +02:00
dgelessus
95bcf2f237 Update and add achievements to German translation 2015-06-16 14:05:44 +02:00
Florian "Sangar" Nücke
ab32ac0464 Merge pull request #1220 from cyber01/RU_doc 
Added DataCard to Russian Translation
 2015-06-15 23:43:23 +02:00
cyber01
33d3b3b0f9 Added DataCard to Russian Translation 2015-06-14 20:08:02 +03:00
Florian Nücke
688f5105cf Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-06-14 16:13:56 +02:00
Florian Nücke
d474313a02 I keep forgetting to build these on the old distro... 2015-06-14 16:13:34 +02:00
Florian Nücke
a70e4077f2 Adjustments for 1.8. 2015-06-14 16:02:10 +02:00
Florian Nücke
9d5c58cc61 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/common/init/Items.scala
 2015-06-14 15:54:25 +02:00
Florian Nücke
6e34f1d1ae Added manual entry and tooltip for data card, and increased cost a bit. 2015-06-14 15:50:26 +02:00
Florian Nücke
a7267d143e Added texture for data card, added soft and hard input size limits and added energy costs. 2015-06-14 15:25:21 +02:00
Florian Nücke
3220d04651 Merge branch 'datacard' of https://github.com/Kubuxu/OpenComputers into data-card 2015-06-14 14:44:01 +02:00
Florian Nücke
4abd0cf3ce Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/Loot.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
 2015-06-14 14:23:48 +02:00
Florian Nücke
d6425b9bee Merge branch 'master' of https://github.com/magik6k/OpenComputers into master-MC1.7.10 2015-06-14 14:11:30 +02:00
Florian Nücke
f108973315 Listened to a bunch of IntelliJ's suggestions. 
inb4 everything broke.
 2015-06-14 14:11:07 +02:00
Łukasz Magiera
dd184681c9
Fixed network stack multiple tcp connections 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-06-14 13:59:58 +02:00
Florian Nücke
b0dc3a2d84 Fixed keyboard.isKeyDown for chars (strings), making use of the utf8 lib when available (Lua 5.3). Closes #1214. 
Thanks to @bawr for pointing out the bug in the first place.
 2015-06-14 13:53:11 +02:00
Florian Nücke
83b47501d6 Hopefully fixes issue with uninitialized loot disks. Closes #1191. 2015-06-14 13:42:01 +02:00
Florian Nücke
0cc849189c Fixed hover boot rendering. 2015-06-14 12:40:36 +02:00
Florian Nücke
6a96038091 Fixed GL state after pet rendering. 2015-06-14 12:21:16 +02:00
Florian Nücke
d357ce2b0e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-06-14 11:54:45 +02:00
Florian Nücke
d37e42258e Merge branch 'master-MC1.7.10' of https://github.com/gamax92/OpenComputers into master-MC1.7.10 2015-06-14 11:35:45 +02:00
Florian Nücke
c3a6657489 Fixed position of hover boots while sneaking. 2015-06-14 11:34:05 +02:00
gamax92
f4868beff6 Add capslock to keyboard.lua 2015-06-13 20:54:47 -06:00
Florian Nücke
81dd166056 Fixed shoulder robot rendering. 2015-06-13 22:26:49 +02:00