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

5205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
a1584036ef Port JEI integration. 2016-07-16 15:17:31 +02:00
Florian Nücke
91754f30c2 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-16 14:49:31 +02:00
Florian Nücke
2c4c627ff5 Merge branch 'jei-handlers' of https://github.com/Vexatos/OpenComputers into master-MC1.8.9 2016-07-16 14:40:39 +02:00
Vexatos
b2e06800fd Partially added item highlighting for JEI. 2016-07-16 14:18:28 +02:00
Florian Nücke
15961b7877 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	build.gradle
#	src/main/scala/li/cil/oc/integration/util/DamageSourceWithRandomCause.scala
 2016-07-16 12:38:38 +02:00
Florian Nücke
82970cc92f Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-16 12:37:07 +02:00
Florian Nücke
450924d6f2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-07-16 12:36:01 +02:00
Vexatos
5c306ea32e Allow properly launching OC in a dev env again. (#1965) 2016-07-16 12:35:54 +02:00
Florian Nücke
0fa7acc4c3 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-07-16 12:35:15 +02:00
Vexatos
6a066a8ba9 Added callback doc handler and moved manual usage handler to its own category. 2016-07-16 12:25:04 +02:00
Vexatos
7295b36c11 Fixed Navigation Upgrade recipe. (#1964) 
Kewl.
 2016-07-16 12:07:15 +02:00
payonel
e2331b67ff improvements to guid, devfs, cat, cp, and system error clarity 
renaming guid to uuid and removing useless method toHex
adding text read and writer, compare to c++ stdlib stringstream. needed for advanced devfs
fix globbing with relative paths and . and .. in path
moving install confirmation before calling .install
fix cp: cp -r . /another/path (should copy contents of current dir)
fix cat when stdin is missing or closed
improved devfs supporting custom dir handlers for dynamic file listing

other non functional changes to clean up code and improved error messages
 2016-07-16 01:08:31 -07:00
Vexatos
3423d93ae1 Moved Loot Disk Cycling handler into separate file. 2016-07-16 09:01:09 +02:00
Vexatos
34382d3d00 Added Manual usage handler for JEI. 2016-07-16 08:34:07 +02:00
Florian Nücke
a06dbdba3e Why did this still compile earlier .-. 2016-07-14 19:01:19 +02:00
Florian Nücke
b4389cc70d Closes #1958. 2016-07-13 19:48:32 +02:00
Florian Nücke
62caf35d80 Merge branch 'fix-boots' of https://github.com/Vexatos/OpenComputers into master-MC1.9.4 2016-07-13 19:36:01 +02:00
Florian Nücke
3d7c3c3e8e Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
 2016-07-13 19:35:09 +02:00
Florian Nücke
7d68bcdcb6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-13 19:33:42 +02:00
Florian Nücke
7106021888 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
#	src/main/scala/li/cil/oc/server/component/DebugCard.scala
 2016-07-13 19:33:26 +02:00
Florian Nücke
6837c7e02f Should fix duplicate UUID in TCP signals. 2016-07-13 19:33:09 +02:00
Florian Nücke
2e122599af Should fix #1941. 2016-07-13 18:53:36 +02:00
Florian Nücke
400d3981e1 Should fix missing updates in high precision mode, closes #1947. 2016-07-13 18:48:20 +02:00
Florian Nücke
a29c048a84 Merge branch 'proper-mc-dependency' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2016-07-13 18:30:48 +02:00
Florian Nücke
16e020adf0 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-07-13 18:30:22 +02:00
tuckertwo
de9ab0906d Fix Typoes in application.conf (#1423) 
* Fix Typoes in application.conf
 2016-07-13 18:30:40 +02:00
Vexatos
7387a0aba8 Added a hard Minecraft version dependency to avoid the coremod not loading on incorrect versions. 2016-07-13 18:30:04 +02:00
Florian Nücke
2ee0c92530 Merge branch 'gametype-fix' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2016-07-13 18:18:01 +02:00
Florian Nücke
62c6b14b82 Merge branch 'too-many-screens' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-07-13 18:17:29 +02:00
Florian Nücke
8e64739db0 Merge branch 'scrench-size' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2016-07-13 18:14:44 +02:00
Łukasz Magiera
4fbbb21f2e Fix internet TCP events 2016-07-13 17:38:53 +02:00
payonel
d46eed8a4a make reliable screen and keyboard selection for boot and terminals 
closes #1933
 2016-07-11 16:00:10 -07:00
Vexatos
a92b20ac4a Set the max stack size of the Scrench to 1. 2016-07-11 12:18:35 +02:00
Vexatos
882b23694b Fixed Debug Card's setGameType. 
Closes #1939.
 2016-07-09 18:02:41 +02:00
Vexatos
317cb577a7 Fixed hover boots not being coloured. 2016-07-09 16:01:42 +02:00
Florian Nücke
a8c5433b29 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-05 20:16:38 +02:00
Florian Nücke
fc3a081105 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-05 20:16:22 +02:00
Florian Nücke
1fdd30ae72 Ah, right. 2016-07-05 20:15:52 +02:00
Florian Nücke
0cba7a5872 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-03 20:35:28 +02:00
Florian Nücke
68c144c8c0 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-03 20:34:34 +02:00
Florian "Sangar" Nücke
3e49ca4d58 Merge pull request #1931 from hws689/master-MC1.7.10 
pt_BR's Translation
 2016-07-03 20:31:55 +02:00
Florian Nücke
8fc5539505 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-03 20:28:42 +02:00
Florian Nücke
01c4c6f375 Fixed hologram rotation not working. 2016-07-03 20:27:57 +02:00
Florian Nücke
d86411c4a0 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-03 20:03:36 +02:00
Florian Nücke
66a04e5406 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-03 20:03:19 +02:00
Florian Nücke
a3c6c4c14b Making an exception. One. 2016-07-03 20:02:47 +02:00
Florian Nücke
7955ca5884 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-03 19:59:11 +02:00
Florian Nücke
2e6298f39d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-03 19:58:51 +02:00
Florian Nücke
32ab472370 Fix potential division by zero in loot disk cycling recipe. 2016-07-03 19:58:27 +02:00
hws689
9d30864478 pt_BR's Translation 2016-07-02 21:04:01 -03:00