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
5,425 Commits 29 Branches 143 Tags
Commit Graph

5425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
e01e06a8bd Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-27 16:51:31 +02:00
Florian Nücke
5964911a80 Allow disabling loot disk cycling via config as per special request :P 2016-05-27 16:51:06 +02:00
Florian Nücke
632f5b7ddb Underp ticking. 2016-05-27 16:45:56 +02:00
Florian Nücke
f1c1c064ae What do you mean, access to client classes on a server? :P 2016-05-27 16:14:31 +02:00
Florian Nücke
030ebb518d This is way more weird than I thought... 2016-05-27 15:27:14 +02:00
Florian Nücke
ae92c73a91 Why IntelliJ, whyyyy? D: 2016-05-27 15:11:57 +02:00
Florian Nücke
ba59e9493f JEI integration for loot disk recrafting (more or less :P). 2016-05-27 15:07:28 +02:00
Florian Nücke
b03ce8bf3d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-27 14:34:48 +02:00
Florian Nücke
0990c09274 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/common/Loot.scala
#	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
#	src/main/scala/li/cil/oc/server/component/InternetCard.scala
 2016-05-27 14:34:37 +02:00
Florian Nücke
4737520b6a Recipe sorting. 2016-05-27 14:34:08 +02:00
Florian Nücke
896bfa2728 Cleanup. 2016-05-27 13:43:15 +02:00
Florian Nücke
b50d3872ee Moved all the things! Renamed all the things! Broke all the things! 
Made most component ROMs into loot disks (except robot for hopefully obvious reasons).
Changed loot disk naming convention (this will break existing loot disks). Closes #1456.
Made all loot disks craftable by cycling through them by crafting one with a wrench (so e.g. craft OpenOS then cycle through).
 2016-05-27 13:33:22 +02:00
Florian Nücke
7eca6c1a10 Fix lighting issues with print preview in 3d printer. 2016-05-26 19:57:30 +02:00
Florian Nücke
ea37f4db67 Not all things must tick. 2016-05-26 17:34:37 +02:00
Florian Nücke
726aa36164 Wrap push/popAttrib, don't for now, since it breaks the GlStateManager. 2016-05-26 11:54:53 +02:00
Florian Nücke
41f51337b0 Porting. 2016-05-25 18:34:01 +02:00
Florian Nücke
bc1107e5cb Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-25 18:33:33 +02:00
Florian Nücke
6e271c79d8 Update player last active time to avoid AFK kicks while working in screens e.g. Closes #1811. 2016-05-25 18:33:15 +02:00
Florian Nücke
fa226ab118 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-25 18:17:14 +02:00
Florian Nücke
3e8e94afa1 Update JEI. 2016-05-25 18:07:44 +02:00
Florian Nücke
0817c6de08 Fixed swapping EEPROMs in MCUs. Closes #1814. 2016-05-25 18:07:07 +02:00
payonel
c819466b04 simplify term hint text indexing and fix lua prompt hint handler 2016-05-24 19:04:33 -07:00
Florian Nücke
7cdf378fd9 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-21 13:44:37 +02:00
Florian Nücke
9e21c3d4f5 Fix setResolution return false even when the resolution changed, closes #1809. 2016-05-21 13:44:14 +02:00
Florian "Sangar" Nücke
feedf21757 Merge pull request #1806 from Vexatos/master-MC1.8.9 
Fixed hover boots texture
 2016-05-14 23:28:08 +02:00
Vexatos
df5ea067c9 Fixed hover boots texture. 2016-05-14 17:49:06 +02:00
Florian Nücke
39a2372705 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/java/li/cil/oc/api/component/RackMountable.java
#	src/main/scala/li/cil/oc/common/block/Rack.scala
#	src/main/scala/li/cil/oc/common/component/TerminalServer.scala
#	src/main/scala/li/cil/oc/server/component/DiskDriveMountable.scala
#	src/main/scala/li/cil/oc/server/component/Server.scala
 2016-05-14 14:18:23 +02:00
Florian Nücke
a21bb1ce3b Might fix #1805. 2016-05-14 14:02:10 +02:00
Florian Nücke
cdd59cff05 Initialize components in client tile entities when loading / receiving description packet. Should fix #1801. 2016-05-14 13:59:31 +02:00
Florian Nücke
ca5d95cff5 Only pass X and Y to RackMountable.onActivate, adjusted to the actual surface area of the mountable (in [0, 1] for both, on the 14x3 pixel surface). Closes #1794. 2016-05-14 13:23:11 +02:00
Florian Nücke
b8ac9976df Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/util/FluidUtils.scala
 2016-05-13 19:40:18 +02:00
Florian Nücke
af07508587 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-05-13 19:30:19 +02:00
Florian Nücke
6a40619696 Fix robots being able to drain from flowing liquid blocks... closes #1796. 
Seriously? Did flowing liquids always magically convert from BlockDynamicLiquid into BlockStaticLiquid after a while? Meta checks? Ugh...
 2016-05-13 19:27:59 +02:00
Florian Nücke
da1dbecae9 Should fix generator upgrade eating container items if they're not taken out in time. Closes #1779. 2016-05-13 18:39:07 +02:00
Florian Nücke
8dbdd383e5 Fixed coloring recipe duping stuff. 2016-05-11 22:18:56 +02:00
Florian Nücke
c1b65f2100 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-11 22:18:40 +02:00
Florian "Sangar" Nücke
2949fdd276 Merge pull request #1787 from hsson/feature/additional-robot-name 
Adds three more names to the list
 2016-05-11 22:10:47 +02:00
Florian "Sangar" Nücke
d0f7fd7e3f Merge pull request #1786 from payonel/devfs-patch 
devfs should be rw
 2016-05-11 22:09:20 +02:00
Florian Nücke
200fd2d51e Fix IC2 NPE. Fixes #1771. 2016-05-11 21:50:45 +02:00
Vexatos
60f403131b Made MFU respect sided environments. 2016-05-07 22:53:16 +02:00
Vexatos
4c665723dc Made block change listener handling a little more safe. 2016-05-07 15:21:00 +02:00
Vexatos
ca2a8ae371 Fixes to MFU. It actually works now. 2016-05-07 15:09:04 +02:00
Vexatos
c6578ff587 Merge remote-tracking branch 'origin/master-MC1.7.10' into mfu 2016-05-07 13:34:35 +02:00
Alexander Håkansson
26c4c0d33c Adds three more names to the list 2016-04-29 22:57:51 +02:00
payonel
2dd3efedc9 isReadOnly is in boot/, move return false to boot file 2016-04-28 16:43:57 -07:00
Florian Nücke
00bc7e2cee Added some missing methods to the devfs to avoid programs expecting them to be there breaking (such as df) and ordered them the same way as they are in the Scala filesystem component. 2016-04-27 23:47:46 +02:00
Florian Nücke
e9dac6e06c Merge branch 'unicode-mouse-clicks' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-04-27 23:30:38 +02:00
payonel
8d9c699ce0 fix onTouch for unicode support in shell (+backspace fix) 2016-04-26 21:34:10 -07:00
Vexatos
371a32e881 Added MFU. 
No Manual entry, no tooltip, no texture, not tested, recipe unfinished.
 2016-04-25 19:55:03 +02:00
payonel
ad33ec285a big awesome update for devfs, command substitution, and io redirection 
Added another 60 tests, now totalling 901 all-passing tests. This change also reduces memory cost for boot by about 1300 bytes.

This change should be fully compatible with any 1.6 user scripts. This makes no change to api, only improves shell support and makes important process handle cleanup (when pipes and redirection is used - we are not auto-closing user file handles).
 2016-04-24 21:59:22 -07:00