AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 11:48:02 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,674 Commits 29 Branches 143 Tags
Commit Graph

3674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
f4ca0367b3 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-15 15:10:16 +02:00
Florian Nücke
ebd477aa21 Added setting to allow changing the color of monochrome (one-bit color depth) text (tier one screen / GPU), closes #459. v1.3.3 2014-08-15 13:27:44 +02:00
Florian Nücke
e22b85342d Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-15 01:36:33 +02:00
Florian Nücke
12082391bb Made hologram max scale setting use doubles instead of ints for more flexibility and reworded the comment in the config a little. 2014-08-15 01:29:23 +02:00
Florian Nücke
5ba5b3cea8 Merge https://github.com/xedp3x/OpenComputers 2014-08-15 01:21:19 +02:00
Florian Nücke
093db6798b Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-15 01:05:05 +02:00
Florian Nücke
3a9f6b0311 Made filesystem.isLink return the destination of the link as a second value, if it is one. 2014-08-15 01:04:38 +02:00
Florian Nücke
9327762d95 Autoconverting Iterables, e.g. for cases like return new Object[]{hashMap.values()} (hope this doesn't break anything). 
Added special key for converters, `oc:flatten`. If there is only key in the converted table and it has that name, the value of that key will be used directly.
 2014-08-15 01:00:35 +02:00
Florian Nücke
c02cbdea8e Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/DebugCard.scala
 2014-08-14 15:58:23 +02:00
Florian Nücke
7b390601f7 Slightly reworked hologram.fill(), now may take an additional param, the lower end of the interval to fill, and won't "autoclear" (will now only overwrite in that interval), which *may* break some programs. I'm so sorry. A little. 2014-08-14 15:55:26 +02:00
Florian Nücke
06a93744a5 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-14 14:37:39 +02:00
Florian "Sangar" Nücke
52252ec49a Merge pull request #487 from Vexatos/patch-10 
Yet another OPPM update
 2014-08-14 14:36:30 +02:00
Vexatos
39c7ab5522 Yet another OPPM update 
Hopefully this fixes dependency installation problems. I need some testers!
 2014-08-14 14:33:04 +02:00
XEdP3X
986ed58c58 transfer hologramMaxScaleByTier to the config file 2014-08-14 11:17:03 +02:00
XEdP3X
1df0804608 transfer hologramMaxScaleByTier to the config file 2014-08-13 18:34:38 +02:00
Florian Nücke
e15f411fbe Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-13 16:51:20 +02:00
Florian Nücke
ea88404d90 Fixed servers being able to boot if a component bus was present but no CPU. 2014-08-13 16:50:40 +02:00
Florian Nücke
30bdf3577b Marking the slot enum related methods in the API as deprecated instead, less spam when building for people using the API. 2014-08-13 16:44:50 +02:00
Florian Nücke
4c1308b592 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala
 2014-08-12 18:40:03 +02:00
Florian Nücke
2c87f6059a Disabling Lua GC while persisting and unpersisting, might help with native crash. 2014-08-12 18:36:18 +02:00
Florian Nücke
53926fba02 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala
 2014-08-12 16:38:10 +02:00
Florian Nücke
891efc924e Still can't remember why top-level coroutine.yield() in programs wouldn't pull events... nothing seems to break, so there. Closes #483. 
Also made sh add traceback to message when program crashes.
 2014-08-12 16:23:46 +02:00
Florian Nücke
034f28ca05 Added a debug card item, allows manipulating the world some to make it easier to test stuff. 2014-08-12 15:52:14 +02:00
Florian Nücke
4d8baa7efa Fixed computers failing to save when saved while performing a synchronized call on userdata. 2014-08-12 15:16:59 +02:00
Florian Nücke
0c8aa8351d Adjustments for 1.7. 2014-08-12 02:54:27 +02:00
Florian Nücke
7508fa4824 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-12 02:51:59 +02:00
Florian Nücke
466dc21592 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/client/gui/Icons.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/event/TinkersConstructToolHandler.scala
	src/main/scala/li/cil/oc/common/tileentity/Case.scala
	src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala
 2014-08-12 02:51:46 +02:00
Florian Nücke
a2e2a9b72e Fixed index out of bounds in term.isWide, closes #484. 2014-08-12 02:51:17 +02:00
Florian Nücke
df9438db8e Made creative tier case only changeable when in creative mode, closes #476. 
Made robots respect inventory.isUsableByPlayer.
 2014-08-12 02:16:54 +02:00
Florian Nücke
de2e419ac7 Implemented component bus item, which replaces the additional CPUs in servers (in existing servers, multiple CPUs will remain functional for now, they just can't be inserted any more, only component buses can). This is in preparation for #393, to allow make a computer's architecture be controlled via the CPU installed in it. 2014-08-11 23:18:55 +02:00
Florian Nücke
6f08f5cafd Changed how slot types are referred to internally in preparation of the Slot enum being removed in 1.4. 2014-08-11 22:16:50 +02:00
Florian Nücke
16b52c8e90 Made assembler a component so it can be queried for its status and assembly can be started automatically. 
Cleaned up textures folder a little.
 2014-08-11 16:55:16 +02:00
Florian Nücke
800e9428ec Also returning tool's display damage and max damage value from robot.durability, because some mods do (IMHO) odd things with those. 2014-08-11 02:02:10 +02:00
Florian Nücke
d9b0dda36e Fixes robot assembler ignoring ignorePower setting, closes #482. 
Checking if player that starts assembly of a robot is in creative mode, if so, finish instantly for all case tiers, closes #481.
 2014-08-10 13:52:58 +02:00
Florian Nücke
e391acf318 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-09 00:12:39 +02:00
Florian Nücke
d71efdfbb8 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-09 00:11:44 +02:00
Florian Nücke
46774783b8 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/multipart/EventHandler.scala
 2014-08-09 00:11:16 +02:00
Florian Nücke
9f9522c82e Added guard against recursive player interaction events in FMP placement handler, should fix #478. 2014-08-09 00:08:08 +02:00
Florian Nücke
0bff124bcf Updated CoFH APIs and fixed some stuff. 2014-08-08 23:57:31 +02:00
Florian Nücke
75a2cc7feb Added support for Galacticraft power. 2014-08-08 23:17:39 +02:00
Florian Nücke
a7ef5c2ffa Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/util/mods/Mods.scala
 2014-08-08 22:54:10 +02:00
Florian Nücke
9f304bda4f Made power support more stable (checking if methods are implemented before injecting the interfaces, to prevent crashes if APIs change, e.g.) 2014-08-08 22:51:38 +02:00
Florian Nücke
cc85154edc Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-08 19:00:26 +02:00
Florian Nücke
7fb44f578a Now properly resolving relative paths based on working directory in tab complete. 2014-08-08 18:50:34 +02:00
Florian Nücke
d7e7a7edf2 Cleaned up and simplified tab-completion logic a little. 
Added shift-tab to inverse cycle suggestions.
Starting completion from cursor location now (sh just eats everything after the cursor for now).
 2014-08-08 18:37:37 +02:00
Florian Nücke
e3a6a3a9b4 Merge https://github.com/magik6k/OpenComputers 2014-08-08 15:52:57 +02:00
Florian Nücke
ac15319727 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/client/gui/Icons.scala
 2014-08-07 17:39:19 +02:00
Florian Nücke
d4b8149e2f Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
 2014-08-07 17:36:05 +02:00
Florian Nücke
93085dc2cb Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-07 17:34:43 +02:00
Florian Nücke
63740cac8a Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-07 17:34:07 +02:00