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

3421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
debc62a941 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-02-16 22:01:58 +01:00
Florian Nücke
aaca5c4592 Fixed dangling raid fses. 2015-02-16 22:01:45 +01:00
Florian "Sangar" Nücke
db4c6a52d2 Merge pull request #915 from magik6k/master 
Event view program for OpenOS.
 2015-02-16 21:01:48 +01:00
Łukasz Magiera
bfb1347e8c Done some suggestions in dmesg.lua 2015-02-16 20:58:46 +01:00
Florian "Sangar" Nücke
065aa0be98 Merge pull request #916 from magik6k/patch-2 
Add backwards compatibility to OpenLoader,
 2015-02-16 20:32:01 +01:00
Łukasz Magiera
d71c52136f
Added backwards compatibility to OpenLoader 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-02-16 18:56:44 +01:00
Łukasz Magiera
d5f19c21d8
Added event viewing program 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-02-16 18:17:43 +01:00
Florian Nücke
fb7c2af0d0 Make key bindings support mouse buttons. Which are totally keys. Fixes #914. 2015-02-16 13:16:41 +01:00
Florian Nücke
327fee7ca8 Fix of recent addition to sh.lua. v1.5.0-beta.1 2015-02-14 22:34:17 +01:00
Florian "Sangar" Nücke
539bc81c84 Merge pull request #870 from tmpvaracc/patch-1 
Update robot.names
 2015-02-14 21:45:47 +01:00
tmpvaracc
8d4bacd985 Update robot.names 
Fixed alphabet order
 2015-02-13 23:26:05 -05:00
Łukasz Magiera
4cedbb41e7
Clean io mode for sh.lua 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-02-13 19:49:13 +01:00
Florian Nücke
82e57b507b Made third container in creative robot a disk drive, and added one to creative tablet. 2015-02-13 17:44:23 +01:00
Florian Nücke
6e4debf72b Underped MCU and Access Points' outer component nodes a little. 
This also means MCU is now network visible again.
 2015-02-13 16:10:06 +01:00
Florian Nücke
62afa212d5 This one's for @Vexatos. 2015-02-13 14:59:59 +01:00
Florian Nücke
d1397106ba Manually switching Lua locale to "C" for common number formatting on all systems, closes #800. 2015-02-13 14:56:53 +01:00
Florian Nücke
36056d39bd Guava hashing because it's more readable IMHO. 2015-02-13 14:47:30 +01:00
Florian Nücke
a6dcbca292 Merge branch 'world-converter' of https://github.com/benblank/OpenComputers into master-MC1.7.10 2015-02-13 14:44:35 +01:00
Florian Nücke
a648b1f250 Added not to machines' power button to use an analyzer on errors. Closes #896. 2015-02-13 14:07:06 +01:00
Florian Nücke
36ab91cdac Workaround for Mystcraft not updating total world time in client worlds. 2015-02-13 13:52:48 +01:00
Florian Nücke
5750ec8ba1 Should fix #911, merging networks containing nodes with the same address could lead to errors if these nodes had Visibility.None. 2015-02-13 13:30:41 +01:00
Florian Nücke
ec2bca401c Fallback to to-stringing values when pushing them to Lua instead of yielding null. 
Should make it easier to track down missing converters and work well as a default for many things (e.g. ResourceLocations).
 2015-02-12 15:49:32 +01:00
Florian Nücke
970ca688d9 Removed OpenComponents check, it's done its due, I think. 2015-02-12 15:49:18 +01:00
Ben Blank
1629401916 hash dimension ID with world seed to obscure it 2015-02-10 17:12:03 -08:00
Florian Nücke
43edfefa6e Potential rendering improvements (mostly stuff discovered while porting to 1.8 that didn't seem to have an effect in 1.7, but can't hurt to clean up). 2015-02-10 02:32:55 +01:00
Florian Nücke
66763c3317 Fixed robot inventory slot range. 2015-02-10 02:32:14 +01:00
Florian Nücke
c05b4fc3d6 Fixed potential NPE in MCU tooltip. 2015-02-10 02:27:34 +01:00
Florian Nücke
279f87a2b9 Fixed cables having a chance to not yielding outputs when being disassembled. 2015-02-10 02:26:21 +01:00
Florian Nücke
d4b5a6e7db Changed tablet block interaction a bit, closes #905. 
When doing a "short" right click, tablets will behave as before, i.e. shift-right-click opens their GUI, normal right-click will either activate a block or open the GUI. To "analyze" a block, you'll now have to hold the right mouse button for half a second (or whatever it is you use to draw your bow). This will work when sneaking or not, also allowing inspection of blocks that'd otherwise open their GUI (like chests) or do stuff (like levers).
 2015-02-09 20:24:31 +01:00
Florian Nücke
30e37daba6 Merge branch 'recursive-flatten' of https://github.com/benblank/OpenComputers into master-MC1.7.10 2015-02-09 16:20:13 +01:00
Florian Nücke
eec36e94ec Testing method for value conversion and userdata. 2015-02-09 16:19:46 +01:00
Florian Nücke
0e887eb3cc Fixed component node in MCU not being saved properly. 2015-02-09 13:34:03 +01:00
Florian Nücke
43a40cd3a8 Ensure writeToNBT/readFromNBT is only called on the server, as some mods may choose to call it on the client... 2015-02-09 13:30:14 +01:00
Florian Nücke
dab5a56def Added missing check for whether tablet actually can be charged. Closes #902. 2015-02-09 12:53:15 +01:00
Florian Nücke
7819544bde Fixed tablet disassembly. Closes #904. 2015-02-09 12:50:37 +01:00
Ben Blank
3b7fe503b4 add converters for World and WorldProvider objects 2015-02-08 11:44:56 -08:00
Ben Blank
5b09d44944 flatten converted values *after* recursive conversion, not instead of 2015-02-07 21:29:12 -08:00
Florian Nücke
fa5c66907d Merge branch '1.5' into master-MC1.7.10 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
 2015-02-07 16:53:07 +01:00
Florian Nücke
66a51ecf52 Microcontrollers are now fully sided, i.e. each side is in a separate network. Closes #788. 
MCUs do not automatically forward network messages. They do not distribute power. Network messages arriving on all sides will always be forwarded to the MCU. Which sides are used for sending can be controlled via the `microcontroller` component. Further change: computers must now sit directly adjacent to MUCs to access their external component. Avoids the nasty hacks used in access points to avoid duplicate components if two sides are in the same network.

More cleanup, drones can be named now.
 2015-02-07 16:51:42 +01:00
Florian Nücke
0aba4be4b8 Mark power value config settings for upgrading (so existing configs are adjusted automatically). 2015-02-07 15:00:19 +01:00
Florian Nücke
dd3f7652ac Improve robot fake player permission checks, not sure if that method is even used anywhere... 2015-02-06 18:07:43 +01:00
Florian Nücke
803551d288 Avoid interface based block drivers being shown for pretty much everything in the NEI API list. 
Workaround only works for stuff using the prefab class.
Fixed drone API in NEI usage.
 2015-02-06 16:55:12 +01:00
Florian Nücke
383388d57c Version bump. 2015-02-06 13:55:21 +01:00
Florian Nücke
37200adffc Fixed flight height check. 2015-02-06 05:31:46 +01:00
Florian Nücke
747ede3383 Merge branch 'master-MC1.7.10' into 1.5 2015-02-06 04:07:48 +01:00
Florian Nücke
a19d1e614a Name changes! 2015-02-06 04:06:50 +01:00
Florian Nücke
0e7f7a598d Minor cleanup. 2015-02-05 20:02:24 +01:00
Florian Nücke
003463ec4a Limiting robot flight height, by default to 8 blocks above ground for now. 
Movement rules are as follows now:
 1. Robots may only move if the start or target position is valid (e.g. to allow building bridges).
 2. The position below a robot is always valid (can always move down).
 3. Positions up to <flightHeight> above a block are valid (limited flight capabilities).
 4. Any position that has an adjacent block with a solid face towards the position is valid (robots can "climb").
 2015-02-05 20:02:14 +01:00
Florian Nücke
4f222680a9 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-02-05 16:21:08 +01:00
Florian Nücke
f091b19255 Re-evaluated some power values, now that more mods are on RF and generate RF. Closes #888. 
This is based on the RF output of BC and EnderIO generators now, because TE steam dynamos are, in my tests at least, outliers.
 2015-02-05 16:20:54 +01:00