AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-30 00:26:16 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,096 Commits 29 Branches 143 Tags
Commit Graph

5096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
c873f15db2 Fix OpenGL derpiness in drone and robot item renderer. JEI integration (hiding some items, e.g. robot proxy block used while robots are moving). 2015-12-29 22:59:06 +01:00
Florian Nücke
6458e1b149 Cherry picking is hard, apparently. 2015-12-29 20:47:13 +01:00
Florian Nücke
4faf61976c Added TIS-3D integration. 
# Conflicts:
#	build.gradle
#	build.properties
#	src/main/scala/li/cil/oc/integration/Mods.scala
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
 2015-12-29 20:44:40 +01:00
Florian Nücke
02043ed83b Re-enable TIS-3D integration. 
# Conflicts:
#	build.properties
#	src/main/scala/li/cil/oc/integration/Mods.scala
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
 2015-12-29 20:42:47 +01:00
Florian Nücke
fd00e0dce6 Added oc_profileNetwork or oc_pn command to enable logging packets being sent by the server. 2015-12-29 17:15:57 +01:00
Florian Nücke
bfab896a28 Added TIS-3D integration. 2015-12-29 15:04:19 +01:00
Florian Nücke
a60f0cb202 Re-enable TIS-3D integration. 2015-12-29 13:58:51 +01:00
Florian Nücke
97d0242639 Merge branch 'OC1.5-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.8 2015-12-29 13:05:10 +01:00
Florian Nücke
979f00d81d Fixed a bunch of rendering glitches. Fixed NPE in hologram TESR. 2015-12-29 13:02:06 +01:00
Florian Nücke
2a7876cb2b Merge branch 'OC1.5-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 
# Conflicts:
#	build.gradle
#	build.properties
#	src/main/resources/assets/opencomputers/lib/lua53/native.32.bsd.so
#	src/main/resources/assets/opencomputers/lib/lua53/native.32.dll
#	src/main/resources/assets/opencomputers/lib/lua53/native.32.dylib
#	src/main/resources/assets/opencomputers/lib/lua53/native.32.so
#	src/main/resources/assets/opencomputers/lib/lua53/native.64.bsd.so
#	src/main/resources/assets/opencomputers/lib/lua53/native.64.dll
#	src/main/resources/assets/opencomputers/lib/lua53/native.64.dylib
#	src/main/resources/assets/opencomputers/lib/lua53/native.64.so
#	src/main/scala/li/cil/oc/integration/Mods.scala
 2015-12-29 09:30:21 +01:00
Florian Nücke
10cd502557 Version bump. v1.5.21 2015-12-29 09:23:04 +01:00
Florian Nücke
473783fafa Updated Eris. 2015-12-29 09:22:31 +01:00
Florian Nücke
aa04ed1d07 Added TIS-3D integration. 2015-12-29 09:22:12 +01:00
Florian Nücke
2c672c497b Fixed GT recipes, closes #1542. 2015-12-27 15:00:23 +01:00
Florian Nücke
326bafca1d Lowercase errors masterrace. 2015-12-27 14:54:34 +01:00
Florian Nücke
7c2a0541e4 Merge branch 'request-headers' of https://github.com/invliD/OpenComputers into master-MC1.7.10 2015-12-27 14:52:34 +01:00
Florian Nücke
19144d2dc7 Don't disable grog in GT recipe set since it's needed for removing nanomachines now. Closes #1577. 2015-12-27 13:30:45 +01:00
Florian Nücke
9b45cf894a Handle disabled command blocks more gracefully in driver, closes #1575. 2015-12-27 13:25:10 +01:00
Florian Nücke
43d2fba5bf Also grant achievements when picking up related item, not just when assembling/crafting it, closes #1578. 2015-12-27 13:13:14 +01:00
Florian Nücke
178e0c026b Should fix #1574. 2015-12-27 13:04:16 +01:00
Sebastian Brückner
c2e379a757 Added support for HTTP request headers. 2015-12-25 21:14:14 +01:00
Florian Nücke
e1494e9224 Fixed rack internal connectable <-> connectable comms. 2015-12-25 20:28:03 +01:00
Florian Nücke
1bc4695933 Updated native Lua 5.3 to 5.3.2. 2015-12-25 16:09:05 +01:00
Florian Nücke
a3f2e5e31c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-12-24 14:54:50 +01:00
Florian Nücke
ff87273670 Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/resources/assets/opencomputers/lang/ru_RU.lang
 2015-12-24 14:54:35 +01:00
Florian "Sangar" Nücke
03aab465e9 Merge pull request #1582 from PotatoTrumpet/patch-1 
Add 2 Robot Names
 2015-12-24 14:53:42 +01:00
Florian Nücke
6a6c5f6843 Fixed the \0 replacement. 2015-12-24 14:51:50 +01:00
Florian Nücke
6330ab928e Merge branch 'master-MC1.7.10' of https://github.com/mpmxyz/OpenComputers into master-MC1.7.10 2015-12-24 14:39:13 +01:00
mpmxyz
29c49e0cf7 Added term windows and multiscreen support to OpenOS. (no multithreading though) 
Also added wide character support to edit.lua
 2015-12-24 14:34:06 +01:00
Potato
67cc14cc36 Add two new names 
BB-8 : Star Wars: The Force Awakens
Codsworth : Fallout 4
 2015-12-23 23:49:11 -06:00
Florian Nücke
1fc9e8f294 Fixed setPaletteColor using hardcoded 2 for all tiers. 2015-12-23 23:28:31 +01:00
Florian Nücke
b96411c40b Don't create node / remove node in SimpleComponents when getComponentName returns null or an empty string. 
Merry Christmas, Vic.
 2015-12-23 21:27:17 +01:00
cyber01
7d0204d609 Added rack disk drive 2015-12-23 05:23:47 +03:00
Florian Nücke
c83434c533 Fix server eth leds always being on. 2015-12-22 23:59:31 +01:00
Florian Nücke
99e89e5068 Again. 2015-12-22 00:46:19 +01:00
Florian Nücke
d43023952b Updated forge and mappings. 2015-12-22 00:29:08 +01:00
Florian Nücke
550553c884 Add normals for custom item rendering. 2015-12-22 00:19:17 +01:00
Florian Nücke
105e38b85c Oh come ON! 2015-12-21 22:24:03 +01:00
Florian Nücke
a5b1713358 Why does this even make a difference -.- 2015-12-21 22:23:45 +01:00
Florian "Sangar" Nücke
56035ddf0c Merge pull request #1576 from magik6k/plan9k 
Update Plan9k
 2015-12-20 23:35:33 +01:00
Łukasz Magiera
8271ede0f8 Update Plan9k 2015-12-20 23:02:02 +01:00
Florian "Sangar" Nücke
117219fb0a Merge pull request #1573 from magik6k/patch-embedslot 
Fixed embedSlot in GuiType
 2015-12-19 11:33:57 +01:00
Łukasz Magiera
c58b8f5fe3 Fixed embedSlot in GuiType 2015-12-18 15:05:38 +01:00
Florian "Sangar" Nücke
16ef4a28c3 Merge pull request #1570 from Pwootage/master-MC1.7.10 
Add filename to FileNotFoundExceptions thrown in various filesystem implementations
 2015-12-18 10:18:06 +01:00
Pwootage
dbdc813fad Add filename to FileNotFoundExceptions thrown in various filesystem implementations 2015-12-17 15:34:50 -07:00
Florian "Sangar" Nücke
99baeabdf7 Merge pull request #1572 from magik6k/patch-netcards 
Network activity LED for servers.
 2015-12-17 23:13:19 +01:00
Łukasz Magiera
ce2117dd6b Network activity LED for servers 2015-12-17 23:03:49 +01:00
Florian Nücke
214a0c2c30 Ohwaitididntbumptheversionyet. 2015-12-16 21:39:11 +01:00
Florian Nücke
ee255c90ff Corrected EEPROM docstring. Closes #1553. 2015-12-16 21:30:56 +01:00
Florian Nücke
fc750e153e Also apply linear filtering setting (textLinearFiltering) to unifont renderer. Closes #1548. 2015-12-16 21:29:54 +01:00